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

make Caps IDisposable

Browse Source
This commit is contained in:
UbitUmarov
2020-04-30 03:37:28 +01:00
parent 36d005e1cc
commit 22c28a0260
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
View File

@@ -191,11 +191,11 @@ namespace OpenSim.Region.CoreModules.Framework
lock (m_capsObjects)
{
if (m_capsObjects.ContainsKey(circuitCode))
if (m_capsObjects.TryGetValue(circuitCode, out Caps cp))
{
m_capsObjects[circuitCode].DeregisterHandlers();
m_scene.EventManager.TriggerOnDeregisterCaps(agentId, m_capsObjects[circuitCode]);
m_scene.EventManager.TriggerOnDeregisterCaps(agentId, cp);
m_capsObjects.Remove(circuitCode);
cp.Dispose();
}
else
{
@@ -203,9 +203,9 @@ namespace OpenSim.Region.CoreModules.Framework
{
if (kvp.Value.AgentID == agentId)
{
kvp.Value.DeregisterHandlers();
m_scene.EventManager.TriggerOnDeregisterCaps(agentId, kvp.Value);
m_capsObjects.Remove(kvp.Key);
kvp.Value.Dispose();
return;
}
}