aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs6
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 984058c..975d769 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1943,6 +1943,7 @@ namespace OpenSim.Region.Framework.Scenes
1943 /// If true, the object is made persistent into the scene. 1943 /// If true, the object is made persistent into the scene.
1944 /// If false, the object will not persist over server restarts 1944 /// If false, the object will not persist over server restarts
1945 /// </param> 1945 /// </param>
1946 /// <returns>true if the object was added. false if not</returns>
1946 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) 1947 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
1947 { 1948 {
1948 return AddNewSceneObject(sceneObject, attachToBackup, true); 1949 return AddNewSceneObject(sceneObject, attachToBackup, true);
@@ -1960,6 +1961,7 @@ namespace OpenSim.Region.Framework.Scenes
1960 /// If true, updates for the new scene object are sent to all viewers in range. 1961 /// If true, updates for the new scene object are sent to all viewers in range.
1961 /// If false, it is left to the caller to schedule the update 1962 /// If false, it is left to the caller to schedule the update
1962 /// </param> 1963 /// </param>
1964 /// <returns>true if the object was added. false if not</returns>
1963 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) 1965 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
1964 { 1966 {
1965 if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates)) 1967 if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates))
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 36a454e..006f9c6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -357,7 +357,13 @@ namespace OpenSim.Region.Framework.Scenes
357 return false; 357 return false;
358 358
359 if (Entities.ContainsKey(sceneObject.UUID)) 359 if (Entities.ContainsKey(sceneObject.UUID))
360 {
361// m_log.DebugFormat(
362// "[SCENEGRAPH]: Scene graph for {0} already contains object {1} in AddSceneObject()",
363// m_parentScene.RegionInfo.RegionName, sceneObject.UUID);
364
360 return false; 365 return false;
366 }
361 367
362// m_log.DebugFormat( 368// m_log.DebugFormat(
363// "[SCENEGRAPH]: Adding scene object {0} {1}, with {2} parts on {3}", 369// "[SCENEGRAPH]: Adding scene object {0} {1}, with {2} parts on {3}",