diff options
author | Melanie | 2010-06-13 03:56:47 +0100 |
---|---|---|
committer | Melanie | 2010-06-13 03:56:47 +0100 |
commit | deaf6bff985aa4a408575cc89e70366ccb79a723 (patch) | |
tree | a76e5365ff31edd14af54eeaa7c18fe33b7622e8 /OpenSim/Region/Framework/Scenes/Serialization | |
parent | Change flavor to 0.7-RC1 (diff) | |
parent | Added Old Guids=true to all MySql connection strings. (diff) | |
download | opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.zip opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.gz opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.bz2 opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.xz |
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index f7544ac..5bdaa17 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -221,7 +221,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
221 | sr = new StringReader(parts[i].OuterXml); | 221 | sr = new StringReader(parts[i].OuterXml); |
222 | reader = new XmlTextReader(sr); | 222 | reader = new XmlTextReader(sr); |
223 | SceneObjectPart part = SceneObjectPart.FromXml(reader); | 223 | SceneObjectPart part = SceneObjectPart.FromXml(reader); |
224 | |||
225 | int originalLinkNum = part.LinkNum; | ||
226 | |||
224 | sceneObject.AddPart(part); | 227 | sceneObject.AddPart(part); |
228 | |||
229 | // SceneObjectGroup.AddPart() tries to be smart and automatically set the LinkNum. | ||
230 | // We override that here | ||
231 | if (originalLinkNum != 0) | ||
232 | part.LinkNum = originalLinkNum; | ||
233 | |||
225 | part.StoreUndoState(); | 234 | part.StoreUndoState(); |
226 | reader.Close(); | 235 | reader.Close(); |
227 | sr.Close(); | 236 | sr.Close(); |