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

Xengine: cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2020-08-31 17:37:15 +01:00
parent 7364acf42e
commit 3c3553d5b1
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@@ -1568,14 +1568,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
IScriptInstance instance = null;
lock (m_Scripts)
{
// Do we even have it?
if (!m_Scripts.ContainsKey(itemID))
if (!m_Scripts.TryGetValue(itemID, out instance))
return;
instance = m_Scripts[itemID];
m_Scripts.Remove(itemID);
}
@@ -1744,18 +1741,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine
lock (m_PrimObjects)
{
if (!m_PrimObjects.ContainsKey(localID))
if (!m_PrimObjects.TryGetValue(localID, out uuids))
return false;
uuids = m_PrimObjects[localID];
foreach (UUID itemID in uuids)
{
IScriptInstance instance = null;
try
{
if (m_Scripts.ContainsKey(itemID))
instance = m_Scripts[itemID];
m_Scripts.TryGetValue(itemID, out instance);
}
catch { /* ignore race conditions */ }
@@ -1793,9 +1787,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
/// <returns></returns>
public bool PostScriptEvent(UUID itemID, EventParams p)
{
if (m_Scripts.ContainsKey(itemID))
if (m_Scripts.TryGetValue(itemID, out IScriptInstance instance))
{
IScriptInstance instance = m_Scripts[itemID];
if (instance != null)
instance.PostEvent(p);
return true;
@@ -1889,14 +1882,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
private IScriptInstance GetInstance(UUID itemID)
{
IScriptInstance instance;
lock (m_Scripts)
{
if (!m_Scripts.ContainsKey(itemID))
return null;
instance = m_Scripts[itemID];
if (m_Scripts.TryGetValue(itemID, out IScriptInstance instance))
return instance;
}
return instance;
return null;
}
public void SetScriptState(UUID itemID, bool running, bool self)