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

mantis 8135

httptests
UbitUmarov 2017-05-02 15:16:56 +01:00
parent 55f7986b44
commit 710677cdc6
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
View File

@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
// wrap this in a try block so that defaults will work if // wrap this in a try block so that defaults will work if
// the config file doesn't specify otherwise. // the config file doesn't specify otherwise.
int maxlisteners = 1000; int maxlisteners = 1000;
int maxhandles = 64; int maxhandles = 65;
try try
{ {
m_whisperdistance = config.Configs["Chat"].GetInt( m_whisperdistance = config.Configs["Chat"].GetInt(
@ -130,8 +130,15 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
catch (Exception) catch (Exception)
{ {
} }
if (maxlisteners < 1) maxlisteners = int.MaxValue;
if (maxhandles < 1) maxhandles = int.MaxValue; if (maxlisteners < 1)
maxlisteners = int.MaxValue;
if (maxhandles < 1)
maxhandles = int.MaxValue;
if (maxlisteners < maxhandles)
maxlisteners = maxhandles;
m_listenerManager = new ListenerManager(maxlisteners, maxhandles); m_listenerManager = new ListenerManager(maxlisteners, maxhandles);
m_pendingQ = new Queue(); m_pendingQ = new Queue();
m_pending = Queue.Synchronized(m_pendingQ); m_pending = Queue.Synchronized(m_pendingQ);
@ -605,11 +612,9 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
li.GetHandle().Equals(handle)) li.GetHandle().Equals(handle))
{ {
lis.Value.Remove(li); lis.Value.Remove(li);
m_curlisteners--;
if (lis.Value.Count == 0) if (lis.Value.Count == 0)
{ m_listeners.Remove(lis.Key); // bailing of loop so this does not smoke
m_listeners.Remove(lis.Key);
m_curlisteners--;
}
// there should be only one, so we bail out early // there should be only one, so we bail out early
return; return;
} }
@ -718,6 +723,9 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
} }
} }
if(handles.Count >= m_maxhandles)
return -1;
// Note: 0 is NOT a valid handle for llListen() to return // Note: 0 is NOT a valid handle for llListen() to return
for (int i = 1; i <= m_maxhandles; i++) for (int i = 1; i <= m_maxhandles; i++)
{ {