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

* Added a sanity check for Mono before trying to enumerate over an empty SortedDictionary 

* Changed the order of a log line from DotNetEngine so you can tell whether or not it is actually loading
prioritization
John Hurliman 2009-10-06 13:39:10 -07:00
parent fa6027aa09
commit 25676ac5cf
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
View File

@ -111,6 +111,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
lock (SyncRoot) lock (SyncRoot)
{ {
if (packets.Count == 0)
return null;
using (SortedDictionary<uint, OutgoingPacket>.ValueCollection.Enumerator e = packets.Values.GetEnumerator()) using (SortedDictionary<uint, OutgoingPacket>.ValueCollection.Enumerator e = packets.Values.GetEnumerator())
return e.Current; return e.Current;
} }

8
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
View File

@ -129,10 +129,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
public void AddRegion(Scene Sceneworld) public void AddRegion(Scene Sceneworld)
{ {
m_log.Info("[" + ScriptEngineName + "]: ScriptEngine initializing");
m_Scene = Sceneworld;
// Make sure we have config // Make sure we have config
if (ConfigSource.Configs[ScriptEngineName] == null) if (ConfigSource.Configs[ScriptEngineName] == null)
ConfigSource.AddConfig(ScriptEngineName); ConfigSource.AddConfig(ScriptEngineName);
@ -143,6 +139,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
if (!m_enabled) if (!m_enabled)
return; return;
m_log.Info("[" + ScriptEngineName + "]: ScriptEngine initializing");
m_Scene = Sceneworld;
// Create all objects we'll be using // Create all objects we'll be using
m_EventQueueManager = new EventQueueManager(this); m_EventQueueManager = new EventQueueManager(this);
m_EventManager = new EventManager(this, true); m_EventManager = new EventManager(this, true);