aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-29 20:20:47 +0000
committerJustin Clarke Casey2009-05-29 20:20:47 +0000
commit6eb191c87b982a96c71fe17f42fd6f52093acf41 (patch)
tree74348d07ee672f1d381821652ab6ef6196d7588a /OpenSim/Region/Framework
parent* minor: move common serialization test code into fixture setup (diff)
downloadopensim-SC-6eb191c87b982a96c71fe17f42fd6f52093acf41.zip
opensim-SC-6eb191c87b982a96c71fe17f42fd6f52093acf41.tar.gz
opensim-SC-6eb191c87b982a96c71fe17f42fd6f52093acf41.tar.bz2
opensim-SC-6eb191c87b982a96c71fe17f42fd6f52093acf41.tar.xz
* Add save xml2 serialization test
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
2 files changed, 3 insertions, 2 deletions
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
1803 1803
1804 if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) 1804 if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim)
1805 { 1805 {
1806 if (sceneObject.RootPart.Shape.State != 0) // Attchment 1806 if (sceneObject.RootPart.Shape.State != 0) // Attachment
1807 { 1807 {
1808
1809 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez); 1808 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
1810 1809
1811 AddRestoredSceneObject(sceneObject, false, false); 1810 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
595 m_rotationOffset = PhysActor.Orientation; 595 m_rotationOffset = PhysActor.Orientation;
596 } 596 }
597 } 597 }
598
598 return m_rotationOffset; 599 return m_rotationOffset;
599 } 600 }
601
600 set 602 set
601 { 603 {
602 StoreUndoState(); 604 StoreUndoState();