aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorUbitUmarov2019-11-23 01:17:03 +0000
committerUbitUmarov2019-11-23 01:17:03 +0000
commit14270e316af0276ec361c9f356f8d769c3b24285 (patch)
tree851b640eb27d57285cd674ac7120efa8d49ef185 /OpenSim/Region/Framework/Scenes
parentYEngine: change some startup log messages (diff)
downloadopensim-SC-14270e316af0276ec361c9f356f8d769c3b24285.zip
opensim-SC-14270e316af0276ec361c9f356f8d769c3b24285.tar.gz
opensim-SC-14270e316af0276ec361c9f356f8d769c3b24285.tar.bz2
opensim-SC-14270e316af0276ec361c9f356f8d769c3b24285.tar.xz
fix xml decode of kfm in single prims case
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index de880e3..8cd2c7f 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -110,15 +110,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
110 } 110 }
111 } 111 }
112 while (reader.ReadToNextSibling("Part")); 112 while (reader.ReadToNextSibling("Part"));
113 reader.ReadEndElement(); 113 reader.ReadEndElement();
114 } 114 }
115 else
116 reader.Read();
115 117
116 if (reader.Name == "KeyframeMotion" && reader.NodeType == XmlNodeType.Element) 118 if (reader.Name == "KeyframeMotion" && reader.NodeType == XmlNodeType.Element)
117 { 119 {
118 120 string innerkeytxt = reader.ReadElementContentAsString();
119 string innerkeytxt = reader.ReadElementContentAsString(); 121 sceneObject.RootPart.KeyframeMotion =
120 sceneObject.RootPart.KeyframeMotion = 122 KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(innerkeytxt));
121 KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(innerkeytxt));
122 } 123 }
123 else 124 else
124 sceneObject.RootPart.KeyframeMotion = null; 125 sceneObject.RootPart.KeyframeMotion = null;