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

avoid a possible null ref; cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2022-02-09 23:08:58 +00:00
parent 38d3346a6a
commit 9d390564a9
3 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
View File

@@ -83,7 +83,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
/// <summary>
/// Scenes by Region Handle
/// </summary>
private Dictionary<ulong, Scene> m_scenel = new Dictionary<ulong, Scene>();
private Dictionary<ulong, Scene> m_scenes = new Dictionary<ulong, Scene>();
// private int m_stipend = 1000;
@@ -138,9 +138,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
scene.RegisterModuleInterface<IMoneyModule>(this);
IHttpServer httpServer = MainServer.Instance;
lock (m_scenel)
lock (m_scenes)
{
if (m_scenel.Count == 0)
if (m_scenes.Count == 0)
{
m_localEconomyURL = scene.RegionInfo.ServerURI;
m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
@@ -154,13 +154,13 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
MainServer.Instance.AddSimpleStreamHandler(new SimpleStreamHandler("/landtool.php", processPHP));
}
if (m_scenel.ContainsKey(scene.RegionInfo.RegionHandle))
if (m_scenes.ContainsKey(scene.RegionInfo.RegionHandle))
{
m_scenel[scene.RegionInfo.RegionHandle] = scene;
m_scenes[scene.RegionInfo.RegionHandle] = scene;
}
else
{
m_scenel.Add(scene.RegionInfo.RegionHandle, scene);
m_scenes.Add(scene.RegionInfo.RegionHandle, scene);
}
}
@@ -366,9 +366,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
private SceneObjectPart findPrim(UUID objectID)
{
lock (m_scenel)
lock (m_scenes)
{
foreach (Scene s in m_scenel.Values)
foreach (Scene s in m_scenes.Values)
{
SceneObjectPart part = s.GetSceneObjectPart(objectID);
if (part != null)
@@ -616,25 +616,14 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
/// <returns></returns>
private IClientAPI LocateClientObject(UUID AgentID)
{
ScenePresence tPresence = null;
IClientAPI rclient = null;
lock (m_scenel)
ScenePresence tPresence;
lock (m_scenes)
{
foreach (Scene _scene in m_scenel.Values)
foreach (Scene _scene in m_scenes.Values)
{
tPresence = _scene.GetScenePresence(AgentID);
if (tPresence != null)
{
if (!tPresence.IsChildAgent)
{
rclient = tPresence.ControllingClient;
}
}
if (rclient != null)
{
return rclient;
}
if (tPresence != null && !tPresence.IsDeleted && !tPresence.IsChildAgent)
return tPresence.ControllingClient;
}
}
return null;
@@ -642,18 +631,13 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
private Scene LocateSceneClientIn(UUID AgentId)
{
lock (m_scenel)
lock (m_scenes)
{
foreach (Scene _scene in m_scenel.Values)
foreach (Scene _scene in m_scenes.Values)
{
ScenePresence tPresence = _scene.GetScenePresence(AgentId);
if (tPresence != null)
{
if (!tPresence.IsChildAgent)
{
return _scene;
}
}
if (tPresence != null && !tPresence.IsDeleted && !tPresence.IsChildAgent)
return _scene;
}
}
return null;
@@ -665,9 +649,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
/// <returns></returns>
public Scene GetRandomScene()
{
lock (m_scenel)
lock (m_scenes)
{
foreach (Scene rs in m_scenel.Values)
foreach (Scene rs in m_scenes.Values)
return rs;
}
return null;
@@ -680,9 +664,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
/// <returns></returns>
public Scene GetSceneByUUID(UUID RegionID)
{
lock (m_scenel)
lock (m_scenes)
{
foreach (Scene rs in m_scenel.Values)
foreach (Scene rs in m_scenes.Values)
{
if (rs.RegionInfo.originRegionID == RegionID)
{