aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
diff options
context:
space:
mode:
authorMelanie2012-02-26 14:30:24 +0100
committerMelanie2012-02-26 14:30:24 +0100
commit8cdc115c91bd074539c5fbae719313d4dc616355 (patch)
treeb071a6011f0644044f02be9ecdd0e84ac957d468 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
parentFix an infinite recursion caused by checking the wrong values for (diff)
downloadopensim-SC-8cdc115c91bd074539c5fbae719313d4dc616355.zip
opensim-SC-8cdc115c91bd074539c5fbae719313d4dc616355.tar.gz
opensim-SC-8cdc115c91bd074539c5fbae719313d4dc616355.tar.bz2
opensim-SC-8cdc115c91bd074539c5fbae719313d4dc616355.tar.xz
Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new
code.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs5
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index a9f3e84..118a63a 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -246,14 +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 {
250 m_log.DebugFormat("[SERIALIZER]: Deserialized KeyframeMotion");
251 sceneObject.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText)); 249 sceneObject.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText));
252 }
253 else 250 else
254 {
255 sceneObject.KeyframeMotion = null; 251 sceneObject.KeyframeMotion = null;
256 }
257 252
258 // 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
259 // ever a problem. 254 // ever a problem.