aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
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
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')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs10
3 files changed, 3 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5c7bca0..ec911a5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2554,8 +2554,6 @@ namespace OpenSim.Region.Framework.Scenes
2554 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns> 2554 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns>
2555 public bool AddSceneObject(SceneObjectGroup sceneObject) 2555 public bool AddSceneObject(SceneObjectGroup sceneObject)
2556 { 2556 {
2557 sceneObject.SetScene(this);
2558
2559 // Force allocation of new LocalId 2557 // Force allocation of new LocalId
2560 // 2558 //
2561 SceneObjectPart[] parts = sceneObject.Parts; 2559 SceneObjectPart[] parts = sceneObject.Parts;
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 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 96cc376..4e0e183 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1055,16 +1055,6 @@ namespace OpenSim.Region.Framework.Scenes
1055 { 1055 {
1056 return Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f); 1056 return Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
1057 } 1057 }
1058
1059 /// <summary>
1060 /// Added as a way for the storage provider to reset the scene,
1061 /// most likely a better way to do this sort of thing but for now...
1062 /// </summary>
1063 /// <param name="scene"></param>
1064 public void SetScene(Scene scene)
1065 {
1066 m_scene = scene;
1067 }
1068 1058
1069 /// <summary> 1059 /// <summary>
1070 /// Set a part to act as the root part for this scene object 1060 /// Set a part to act as the root part for this scene object