OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

cpu-performance
Justin Clark-Casey (justincc) 2013-05-29 22:40:51 +01:00
parent 4898f18f89 233b9ec4d7
commit f9ee9efb97
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1348,7 +1348,9 @@ namespace OpenSim.Region.Framework.Scenes
// Create child agents in neighbouring regions // Create child agents in neighbouring regions
if (openChildAgents && !IsChildAgent) if (openChildAgents && !IsChildAgent)
{ {
// Remember in HandleUseCircuitCode, we delayed this to here
SendInitialDataToMe(); SendInitialDataToMe();
IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
if (m_agentTransfer != null) if (m_agentTransfer != null)
Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); }); Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });

11
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
View File

@ -117,6 +117,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
private IConfig m_config; private IConfig m_config;
private object m_Lock;
public void Initialise(IConfigSource config) public void Initialise(IConfigSource config)
{ {
@ -128,6 +130,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
if (!m_config.GetBoolean("enabled", false)) if (!m_config.GetBoolean("enabled", false))
return; return;
m_Lock = new object();
try try
{ {
// retrieve configuration variables // retrieve configuration variables
@ -1111,6 +1115,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
doc = new XmlDocument(); doc = new XmlDocument();
// Let's serialize all calls to Vivox. Most of these are driven by
// the clients (CAPs), when the user arrives at the region. We don't
// want to issue many simultaneous http requests to Vivox, because mono
// doesn't like that
lock (m_Lock)
{
try try
{ {
// Otherwise prepare the request // Otherwise prepare the request
@ -1131,6 +1141,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
{ {
m_log.ErrorFormat("[VivoxVoice] Error in admin call : {0}", e.Message); m_log.ErrorFormat("[VivoxVoice] Error in admin call : {0}", e.Message);
} }
}
// If we're debugging server responses, dump the whole // If we're debugging server responses, dump the whole
// load now // load now