From 6eb191c87b982a96c71fe17f42fd6f52093acf41 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 29 May 2009 20:20:47 +0000 Subject: * Add save xml2 serialization test --- OpenSim/Region/Framework/Scenes/Scene.cs | 3 +-- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f18d542..28d5bad 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1803,9 +1803,8 @@ namespace OpenSim.Region.Framework.Scenes if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) { - if (sceneObject.RootPart.Shape.State != 0) // Attchment + if (sceneObject.RootPart.Shape.State != 0) // Attachment { - sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez); AddRestoredSceneObject(sceneObject, false, false); diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 71d4d33..f0309e3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -595,8 +595,10 @@ namespace OpenSim.Region.Framework.Scenes m_rotationOffset = PhysActor.Orientation; } } + return m_rotationOffset; } + set { StoreUndoState(); -- cgit v1.1