diff options
| author | Mike Rieker | 2010-07-06 02:23:10 +0000 |
|---|---|---|
| committer | Mike Rieker | 2010-07-06 02:23:10 +0000 |
| commit | 6e7f1a3ac11b889175c87f59a3c5361c704363a6 (patch) | |
| tree | 2ed5bebf54db3adc420e1510045b84b880ecb157 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
| parent | rewrote hanging llParseStringKeepNulls() (diff) | |
| parent | Undo fix is now complete. This commit repairs the special case of the root pr... (diff) | |
| download | opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.zip opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.gz opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.bz2 opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.xz | |
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 5bdaa17..77e477f 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
| @@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 105 | sceneObject.AddPart(part); | 105 | sceneObject.AddPart(part); |
| 106 | part.LinkNum = linkNum; | 106 | part.LinkNum = linkNum; |
| 107 | part.TrimPermissions(); | 107 | part.TrimPermissions(); |
| 108 | part.StoreUndoState(); | 108 | part.StoreUndoState(UndoType.STATE_ALL); |
| 109 | reader.Close(); | 109 | reader.Close(); |
| 110 | sr.Close(); | 110 | sr.Close(); |
| 111 | } | 111 | } |
| @@ -231,7 +231,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 231 | if (originalLinkNum != 0) | 231 | if (originalLinkNum != 0) |
| 232 | part.LinkNum = originalLinkNum; | 232 | part.LinkNum = originalLinkNum; |
| 233 | 233 | ||
| 234 | part.StoreUndoState(); | 234 | part.StoreUndoState(UndoType.STATE_ALL); |
| 235 | reader.Close(); | 235 | reader.Close(); |
| 236 | sr.Close(); | 236 | sr.Close(); |
| 237 | } | 237 | } |