aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-07 00:02:45 +0100
committerJustin Clark-Casey (justincc)2012-07-07 00:02:45 +0100
commit7ff4eec79cf16886439604a23126abd195ae8b2e (patch)
treef59be673321e6a74dc429e52e585ef165a8a845d /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentRemove now duplicate interregion object check that should have been removed a... (diff)
downloadopensim-SC_OLD-7ff4eec79cf16886439604a23126abd195ae8b2e.zip
opensim-SC_OLD-7ff4eec79cf16886439604a23126abd195ae8b2e.tar.gz
opensim-SC_OLD-7ff4eec79cf16886439604a23126abd195ae8b2e.tar.bz2
opensim-SC_OLD-7ff4eec79cf16886439604a23126abd195ae8b2e.tar.xz
Remove redundant SetScene() function in Scene.AddSceneObject()
This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks. There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index bc9a585..2be5364 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -355,9 +355,9 @@ namespace OpenSim.Region.Framework.Scenes
355 355
356 if (Entities.ContainsKey(sceneObject.UUID)) 356 if (Entities.ContainsKey(sceneObject.UUID))
357 { 357 {
358// m_log.DebugFormat( 358 m_log.DebugFormat(
359// "[SCENEGRAPH]: Scene graph for {0} already contains object {1} in AddSceneObject()", 359 "[SCENEGRAPH]: Scene graph for {0} already contains object {1} in AddSceneObject()",
360// m_parentScene.RegionInfo.RegionName, sceneObject.UUID); 360 m_parentScene.RegionInfo.RegionName, sceneObject.UUID);
361 361
362 return false; 362 return false;
363 } 363 }