From 9011ca8461894f12effba97047718c0801ee7948 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 6 Jun 2017 20:38:17 +0100
Subject: set optional group position and rotation before attach to scene

---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 117d92d..96b8c8b 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -388,19 +388,19 @@ namespace OpenSim.Region.Framework.Scenes
         public bool AddNewSceneObject(
             SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel)
         {
-            AddNewSceneObject(sceneObject, attachToBackup, false);
-
             if (pos != null)
                 sceneObject.AbsolutePosition = (Vector3)pos;
 
+            if (rot != null)
+                sceneObject.UpdateGroupRotationR((Quaternion)rot);
+
+            AddNewSceneObject(sceneObject, attachToBackup, false);
+
             if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim)
             {
                 sceneObject.ClearPartAttachmentData();
             }
 
-            if (rot != null)
-                sceneObject.UpdateGroupRotationR((Quaternion)rot);
-
             PhysicsActor pa = sceneObject.RootPart.PhysActor;
             if (pa != null && pa.IsPhysical && vel != Vector3.Zero)
             {
-- 
cgit v1.1