aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs29
1 files changed, 4 insertions, 25 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 27431ed..a44e88e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -558,18 +558,19 @@ namespace OpenSim.Region.Environment.Scenes
558 m_scripts_enabled = !ScriptEngine; 558 m_scripts_enabled = !ScriptEngine;
559 m_log.Info("[TOTEDD]: Here is the method to trigger disabling of the scripting engine"); 559 m_log.Info("[TOTEDD]: Here is the method to trigger disabling of the scripting engine");
560 } 560 }
561
561 if (m_physics_enabled != !PhysicsEngine) 562 if (m_physics_enabled != !PhysicsEngine)
562 { 563 {
563 m_physics_enabled = !PhysicsEngine; 564 m_physics_enabled = !PhysicsEngine;
564
565 } 565 }
566
567 } 566 }
567
568 public int GetInaccurateNeighborCount() 568 public int GetInaccurateNeighborCount()
569 { 569 {
570 lock (m_neighbours) 570 lock (m_neighbours)
571 return m_neighbours.Count; 571 return m_neighbours.Count;
572 } 572 }
573
573 // This is the method that shuts down the scene. 574 // This is the method that shuts down the scene.
574 public override void Close() 575 public override void Close()
575 { 576 {
@@ -1910,29 +1911,7 @@ namespace OpenSim.Region.Environment.Scenes
1910 agentTransactions.RemoveAgentAssetTransactions(agentID); 1911 agentTransactions.RemoveAgentAssetTransactions(agentID);
1911 } 1912 }
1912 1913
1913 lock (m_scenePresences) 1914 m_innerScene.RemoveScenePresence(agentID);
1914 {
1915 if (m_scenePresences.Remove(agentID))
1916 {
1917 //m_log.InfoFormat("[SCENE] Removed scene presence {0}", agentID);
1918 }
1919 else
1920 {
1921 m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
1922 }
1923 }
1924
1925 lock (Entities)
1926 {
1927 if (Entities.Remove(agentID))
1928 {
1929 //m_log.InfoFormat("[SCENE] Removed scene presence {0} from entities list", agentID);
1930 }
1931 else
1932 {
1933 m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene Entities list", agentID);
1934 }
1935 }
1936 1915
1937 try 1916 try
1938 { 1917 {