diff options
author | Melanie | 2012-02-26 18:11:38 +0100 |
---|---|---|
committer | Melanie | 2012-02-26 18:11:38 +0100 |
commit | fca8c82232a42191270cb8d18dba6b54d382a2c2 (patch) | |
tree | 0a5b5e3e7d7034b7fd4e620fc0d21ec7c9f5abcb /OpenSim/Region/Framework/Scenes/Serialization | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
download | opensim-SC_OLD-fca8c82232a42191270cb8d18dba6b54d382a2c2.zip opensim-SC_OLD-fca8c82232a42191270cb8d18dba6b54d382a2c2.tar.gz opensim-SC_OLD-fca8c82232a42191270cb8d18dba6b54d382a2c2.tar.bz2 opensim-SC_OLD-fca8c82232a42191270cb8d18dba6b54d382a2c2.tar.xz |
Move KeyframeMotion from SOG to SOP because we can't persist it any
other way because SOG doesn't technically exist in the DB
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 118a63a..51a3320 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -246,9 +246,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
246 | 246 | ||
247 | XmlNodeList keymotion = doc.GetElementsByTagName("KeyframeMotion"); | 247 | XmlNodeList keymotion = doc.GetElementsByTagName("KeyframeMotion"); |
248 | if (keymotion.Count > 0) | 248 | if (keymotion.Count > 0) |
249 | sceneObject.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText)); | 249 | sceneObject.RootPart.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText)); |
250 | else | 250 | else |
251 | sceneObject.KeyframeMotion = null; | 251 | sceneObject.RootPart.KeyframeMotion = null; |
252 | 252 | ||
253 | // Script state may, or may not, exist. Not having any, is NOT | 253 | // Script state may, or may not, exist. Not having any, is NOT |
254 | // ever a problem. | 254 | // ever a problem. |
@@ -1174,9 +1174,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1174 | 1174 | ||
1175 | writer.WriteEndElement(); | 1175 | writer.WriteEndElement(); |
1176 | 1176 | ||
1177 | if (sog.KeyframeMotion != null) | 1177 | if (sog.RootPart.KeyframeMotion != null) |
1178 | { | 1178 | { |
1179 | Byte[] data = sog.KeyframeMotion.Serialize(); | 1179 | Byte[] data = sog.RootPart.KeyframeMotion.Serialize(); |
1180 | 1180 | ||
1181 | writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty); | 1181 | writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty); |
1182 | writer.WriteBase64(data, 0, data.Length); | 1182 | writer.WriteBase64(data, 0, data.Length); |