OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Refactor: Separate out RemoveScenePresence and add into InnerScene to match existing AddScenePresence

0.6.0-stable
Justin Clarke Casey 2008-05-26 00:38:04 +00:00
parent 5d77625e9a
commit 73a28a56da
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -520,6 +520,7 @@ namespace OpenSim.Region.Environment.Scenes
Entities[client.AgentId] = newAvatar; Entities[client.AgentId] = newAvatar;
} }
} }
lock (ScenePresences) lock (ScenePresences)
{ {
if (ScenePresences.ContainsKey(client.AgentId)) if (ScenePresences.ContainsKey(client.AgentId))
@ -535,7 +536,11 @@ namespace OpenSim.Region.Environment.Scenes
return newAvatar; return newAvatar;
} }
public void AddScenePresence(ScenePresence presence) /// <summary>
/// Add a presence to the scene
/// </summary>
/// <param name="presence"></param>
internal void AddScenePresence(ScenePresence presence)
{ {
bool child = presence.IsChildAgent; bool child = presence.IsChildAgent;
@ -564,6 +569,36 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
/// <summary>
/// Remove a presence from the scene
/// </summary>
internal void RemoveScenePresence(LLUUID agentID)
{
lock (Entities)
{
if (Entities.Remove(agentID))
{
//m_log.InfoFormat("[SCENE] Removed scene presence {0} from entities list", agentID);
}
else
{
m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene Entities list", agentID);
}
}
lock (ScenePresences)
{
if (ScenePresences.Remove(agentID))
{
//m_log.InfoFormat("[SCENE] Removed scene presence {0}", agentID);
}
else
{
m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
}
}
}
public void SwapRootChildAgent(bool direction_RC_CR_T_F) public void SwapRootChildAgent(bool direction_RC_CR_T_F)
{ {
if (direction_RC_CR_T_F) if (direction_RC_CR_T_F)

29
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -558,18 +558,19 @@ namespace OpenSim.Region.Environment.Scenes
m_scripts_enabled = !ScriptEngine; m_scripts_enabled = !ScriptEngine;
m_log.Info("[TOTEDD]: Here is the method to trigger disabling of the scripting engine"); m_log.Info("[TOTEDD]: Here is the method to trigger disabling of the scripting engine");
} }
if (m_physics_enabled != !PhysicsEngine) if (m_physics_enabled != !PhysicsEngine)
{ {
m_physics_enabled = !PhysicsEngine; m_physics_enabled = !PhysicsEngine;
} }
} }
public int GetInaccurateNeighborCount() public int GetInaccurateNeighborCount()
{ {
lock (m_neighbours) lock (m_neighbours)
return m_neighbours.Count; return m_neighbours.Count;
} }
// This is the method that shuts down the scene. // This is the method that shuts down the scene.
public override void Close() public override void Close()
{ {
@ -1910,29 +1911,7 @@ namespace OpenSim.Region.Environment.Scenes
agentTransactions.RemoveAgentAssetTransactions(agentID); agentTransactions.RemoveAgentAssetTransactions(agentID);
} }
lock (m_scenePresences) m_innerScene.RemoveScenePresence(agentID);
{
if (m_scenePresences.Remove(agentID))
{
//m_log.InfoFormat("[SCENE] Removed scene presence {0}", agentID);
}
else
{
m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
}
}
lock (Entities)
{
if (Entities.Remove(agentID))
{
//m_log.InfoFormat("[SCENE] Removed scene presence {0} from entities list", agentID);
}
else
{
m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene Entities list", agentID);
}
}
try try
{ {