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

cosmetics on newclient, etc

Browse Source
This commit is contained in:
UbitUmarov
2020-08-05 18:30:59 +01:00
parent a45420cf34
commit b18f1a6a56
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/AgentCircuitManager.cs
View File

@@ -117,6 +117,14 @@ namespace OpenSim.Framework
}
}
public virtual void RemoveCircuit(AgentCircuitData ac)
{
m_agentCircuitsByUUID.TryRemove(ac.AgentID, out AgentCircuitData dummy);
m_agentCircuits.TryRemove(ac.circuitcode, out AgentCircuitData dummyb);
if (dummy.circuitcode != ac.circuitcode) //??
m_agentCircuits.TryRemove(dummy.circuitcode, out AgentCircuitData dummyc);
}
public AgentCircuitData GetAgentCircuitData(uint circuitCode)
{
if(m_agentCircuits.TryGetValue(circuitCode, out AgentCircuitData agentCircuit))
@@ -168,7 +176,7 @@ namespace OpenSim.Framework
if (m_agentCircuits.TryRemove(circuitcode, out AgentCircuitData agentData))
{
agentData.circuitcode = newcircuitcode;
m_agentCircuits.TryAdd(newcircuitcode, agentData);
m_agentCircuits[newcircuitcode] = agentData;
m_agentCircuitsByUUID[agentData.AgentID] = agentData;
return true;
}

10
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -4116,7 +4116,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (!VerifyUserPresence(acd, out reason))
{
m_authenticateHandler.RemoveCircuit(acd.circuitcode);
m_authenticateHandler.RemoveCircuit(acd);
return false;
}
}
@@ -4125,7 +4125,7 @@ namespace OpenSim.Region.Framework.Scenes
m_log.ErrorFormat(
"[SCENE]: Exception verifying presence {0}{1}", e.Message, e.StackTrace);
m_authenticateHandler.RemoveCircuit(acd.circuitcode);
m_authenticateHandler.RemoveCircuit(acd);
return false;
}
}
@@ -4134,7 +4134,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (!AuthorizeUser(acd, (vialogin ? false : SeeIntoRegion), out reason))
{
m_authenticateHandler.RemoveCircuit(acd.circuitcode);
m_authenticateHandler.RemoveCircuit(acd);
return false;
}
}
@@ -4143,7 +4143,7 @@ namespace OpenSim.Region.Framework.Scenes
m_log.ErrorFormat(
"[SCENE]: Exception authorizing user {0}{1}", e.Message, e.StackTrace);
m_authenticateHandler.RemoveCircuit(acd.circuitcode);
m_authenticateHandler.RemoveCircuit(acd);
return false;
}
@@ -4225,7 +4225,7 @@ namespace OpenSim.Region.Framework.Scenes
if (!CheckLandPositionAccess(acd.AgentID, true, checkTeleHub, acd.startpos, out reason))
{
m_authenticateHandler.RemoveCircuit(acd.circuitcode);
m_authenticateHandler.RemoveCircuit(acd);
return false;
}
}