aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization
diff options
context:
space:
mode:
authorroot2011-07-09 01:06:46 +0100
committerroot2011-07-09 01:06:46 +0100
commitc920ff9d1d5840fb6b36efd46e8bec431cc5d15f (patch)
tree4b804cf4255f4a8eaa2789cce97154a418f6e0b5 /OpenSim/Region/Framework/Scenes/Serialization
parentRemove another core SNAFU. AbsolutePosition is NOT equal to group position (diff)
parentInstance-types-in-list fix for LSL/OSSL functions. This will fix llListFindLi... (diff)
downloadopensim-SC_OLD-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.zip
opensim-SC_OLD-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.gz
opensim-SC_OLD-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.bz2
opensim-SC_OLD-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 9174070..d6e8223 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1008,6 +1008,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1008 1008
1009 private static void ProcessShpSculptData(PrimitiveBaseShape shp, XmlTextReader reader) 1009 private static void ProcessShpSculptData(PrimitiveBaseShape shp, XmlTextReader reader)
1010 { 1010 {
1011// m_log.DebugFormat("[SCENE OBJECT SERIALIZER]: Setting sculpt data length {0}", shp.SculptData.Length);
1012
1011 shp.SculptData = Convert.FromBase64String(reader.ReadElementString("SculptData")); 1013 shp.SculptData = Convert.FromBase64String(reader.ReadElementString("SculptData"));
1012 } 1014 }
1013 1015