ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

do init new acd circuit code + cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2021-01-17 15:07:35 +00:00
parent 2f79009d32
commit 545e196226
3 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/AgentCircuitManager.cs
View File

@@ -95,6 +95,7 @@ namespace OpenSim.Framework
public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
{
agentData.circuitcode = circuitCode;
RemoveCircuit(agentData.AgentID); // no duplications
m_agentCircuits[circuitCode] = agentData;
m_agentCircuitsByUUID[agentData.AgentID] = agentData;

3
OpenSim/Framework/Util.cs
View File

@@ -3114,7 +3114,6 @@ namespace OpenSim.Framework
finally
{
Interlocked.Decrement(ref numRunningThreadFuncs);
threadInfo.Ended();
activeThreads.TryRemove(threadFuncNum, out ThreadInfo dummy);
if (loggingEnabled && threadInfo.LogThread)
m_log.DebugFormat("Exit threadfunc {0} ({1})", threadFuncNum, FormatDuration(threadInfo.Elapsed()));
@@ -3125,7 +3124,7 @@ namespace OpenSim.Framework
};
}
long numQueued = Interlocked.Increment(ref numQueuedThreadFuncs);
Interlocked.Increment(ref numQueuedThreadFuncs);
try
{
threadInfo.LogThread = false;