diff options
author | Justin Clark-Casey (justincc) | 2011-07-19 01:24:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-19 01:24:43 +0100 |
commit | 86f45f6fe716541647e628bc6a29df63330813f8 (patch) | |
tree | dc13abea24feb2a50def2c48c66a968cd1b65379 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
parent | Make various tweaks to undo code in an effort to get things working better. (diff) | |
download | opensim-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 'OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 4 |
1 files changed, 1 insertions, 3 deletions
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) |