diff options
| author | Dan Lake | 2011-07-11 12:23:20 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-11 12:23:20 -0700 |
| commit | b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch) | |
| tree | 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/Framework/Scenes/Serialization | |
| parent | Checkin 32 bit bulletsim shared library for Linux. (diff) | |
| parent | minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff) | |
| download | opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 2 |
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 fcf7e0c..c18c93a 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
| @@ -1001,6 +1001,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 1001 | 1001 | ||
| 1002 | private static void ProcessShpSculptData(PrimitiveBaseShape shp, XmlTextReader reader) | 1002 | private static void ProcessShpSculptData(PrimitiveBaseShape shp, XmlTextReader reader) |
| 1003 | { | 1003 | { |
| 1004 | // m_log.DebugFormat("[SCENE OBJECT SERIALIZER]: Setting sculpt data length {0}", shp.SculptData.Length); | ||
| 1005 | |||
| 1004 | shp.SculptData = Convert.FromBase64String(reader.ReadElementString("SculptData")); | 1006 | shp.SculptData = Convert.FromBase64String(reader.ReadElementString("SculptData")); |
| 1005 | } | 1007 | } |
| 1006 | 1008 | ||