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

'cosmetics'

Browse Source
This commit is contained in:
UbitUmarov
2021-09-02 20:58:57 +01:00
parent e89900949d
commit f047cdc5ee
1 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,16 +130,12 @@ namespace OpenSim.Region.CoreModules.Framework
if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
return;
*/
string capsObjectPath = GetCapsPath(agentId);
Caps caps;
String capsObjectPath = GetCapsPath(agentId);
lock (m_capsObjects)
{
if (m_capsObjects.ContainsKey(circuitCode))
if (m_capsObjects.TryGetValue(circuitCode, out Caps oldCaps))
{
Caps oldCaps = m_capsObjects[circuitCode];
if (capsObjectPath == oldCaps.CapsObjectPath)
{
// m_log.WarnFormat(
@@ -183,10 +179,7 @@ namespace OpenSim.Region.CoreModules.Framework
m_log.DebugFormat("[CAPS]: Remove caps for agent {0} in region {1}", agentId, m_scene.RegionInfo.RegionName);
lock (m_childrenSeeds)
{
if (m_childrenSeeds.ContainsKey(agentId))
{
m_childrenSeeds.Remove(agentId);
}
m_childrenSeeds.Remove(agentId);
}
lock (m_capsObjects)
@@ -220,10 +213,8 @@ namespace OpenSim.Region.CoreModules.Framework
{
lock (m_capsObjects)
{
if (m_capsObjects.ContainsKey(circuitCode))
{
return m_capsObjects[circuitCode];
}
if (m_capsObjects.TryGetValue(circuitCode, out Caps cp))
return cp;
}
return null;
@@ -233,10 +224,8 @@ namespace OpenSim.Region.CoreModules.Framework
{
lock (m_capsObjects)
{
if (m_capsObjects.ContainsKey(circuitCode))
{
m_capsObjects[circuitCode].Activate();
}
if (m_capsObjects.TryGetValue(circuitCode, out Caps cp))
cp.Activate();
}
}
@@ -254,33 +243,27 @@ namespace OpenSim.Region.CoreModules.Framework
{
lock (m_capsPaths)
{
if (m_capsPaths.ContainsKey(agentId))
{
return m_capsPaths[agentId];
}
if (m_capsPaths.TryGetValue(agentId, out string path))
return path;
}
return null;
}
public Dictionary<ulong, string> GetChildrenSeeds(UUID agentID)
{
Dictionary<ulong, string> seeds = null;
lock (m_childrenSeeds)
if (m_childrenSeeds.TryGetValue(agentID, out seeds))
{
if (m_childrenSeeds.TryGetValue(agentID, out Dictionary<ulong, string> seeds))
return seeds;
}
return new Dictionary<ulong, string>();
}
public void DropChildSeed(UUID agentID, ulong handle)
{
Dictionary<ulong, string> seeds;
lock (m_childrenSeeds)
{
if (m_childrenSeeds.TryGetValue(agentID, out seeds))
if (m_childrenSeeds.TryGetValue(agentID, out Dictionary<ulong, string> seeds))
{
seeds.Remove(handle);
}
@@ -289,18 +272,14 @@ namespace OpenSim.Region.CoreModules.Framework
public string GetChildSeed(UUID agentID, ulong handle)
{
Dictionary<ulong, string> seeds;
string returnval;
lock (m_childrenSeeds)
{
if (m_childrenSeeds.TryGetValue(agentID, out seeds))
if (m_childrenSeeds.TryGetValue(agentID, out Dictionary<ulong, string> seeds))
{
if (seeds.TryGetValue(handle, out returnval))
if (seeds.TryGetValue(handle, out string returnval))
return returnval;
}
}
return null;
}