aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-19 01:24:43 +0100
committerJustin Clark-Casey (justincc)2011-07-19 01:24:43 +0100
commit86f45f6fe716541647e628bc6a29df63330813f8 (patch)
treedc13abea24feb2a50def2c48c66a968cd1b65379
parentMake various tweaks to undo code in an effort to get things working better. (diff)
downloadopensim-SC_OLD-86f45f6fe716541647e628bc6a29df63330813f8.zip
opensim-SC_OLD-86f45f6fe716541647e628bc6a29df63330813f8.tar.gz
opensim-SC_OLD-86f45f6fe716541647e628bc6a29df63330813f8.tar.bz2
opensim-SC_OLD-86f45f6fe716541647e628bc6a29df63330813f8.tar.xz
remove undo state storage in a few places where it's pointless
no functional effect - existing bugs still remain
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs4
2 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index aab83b8..44d7ce3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3803,8 +3803,6 @@ namespace OpenSim.Region.Framework.Scenes
3803 { 3803 {
3804 m_redo.Clear(); 3804 m_redo.Clear();
3805 } 3805 }
3806
3807 StoreUndoState();
3808 } 3806 }
3809 3807
3810 public EntityIntersection TestIntersection(Ray iray, Quaternion parentrot) 3808 public EntityIntersection TestIntersection(Ray iray, Quaternion parentrot)
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index c18c93a..8fb9fad 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -102,7 +102,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
102 sceneObject.AddPart(part); 102 sceneObject.AddPart(part);
103 part.LinkNum = linkNum; 103 part.LinkNum = linkNum;
104 part.TrimPermissions(); 104 part.TrimPermissions();
105 part.StoreUndoState();
106 reader.Close(); 105 reader.Close();
107 sr.Close(); 106 sr.Close();
108 } 107 }
@@ -236,15 +235,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
236 if (originalLinkNum != 0) 235 if (originalLinkNum != 0)
237 part.LinkNum = originalLinkNum; 236 part.LinkNum = originalLinkNum;
238 237
239 part.StoreUndoState();
240 reader.Close(); 238 reader.Close();
241 sr.Close(); 239 sr.Close();
242 } 240 }
243 241
244 // Script state may, or may not, exist. Not having any, is NOT 242 // Script state may, or may not, exist. Not having any, is NOT
245 // ever a problem. 243 // ever a problem.
246
247 sceneObject.LoadScriptState(doc); 244 sceneObject.LoadScriptState(doc);
245
248 return sceneObject; 246 return sceneObject;
249 } 247 }
250 catch (Exception e) 248 catch (Exception e)