aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorMelanie2012-08-25 17:34:08 +0100
committerMelanie2012-08-25 17:34:08 +0100
commita5c6cb2fc9e5fd0c83bbe2bb821fa5e1a2903374 (patch)
tree1465a797a4c6892c0a46d92b56fcafd6ccb5162d /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentFix and refactor region registration. Reorder checks to short-curcuit expensi... (diff)
parentimplementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParams (diff)
downloadopensim-SC_OLD-a5c6cb2fc9e5fd0c83bbe2bb821fa5e1a2903374.zip
opensim-SC_OLD-a5c6cb2fc9e5fd0c83bbe2bb821fa5e1a2903374.tar.gz
opensim-SC_OLD-a5c6cb2fc9e5fd0c83bbe2bb821fa5e1a2903374.tar.bz2
opensim-SC_OLD-a5c6cb2fc9e5fd0c83bbe2bb821fa5e1a2903374.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index b6339fb..209a770 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
300 public bool AddNewSceneObject( 300 public bool AddNewSceneObject(
301 SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel) 301 SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel)
302 { 302 {
303 AddNewSceneObject(sceneObject, true, false); 303 AddNewSceneObject(sceneObject, attachToBackup, false);
304 304
305 if (pos != null) 305 if (pos != null)
306 sceneObject.AbsolutePosition = (Vector3)pos; 306 sceneObject.AbsolutePosition = (Vector3)pos;