Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
root
2011-07-09 01:06:46 +01:00
23 changed files with 4291 additions and 4015 deletions

View File

@@ -1008,6 +1008,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
private static void ProcessShpSculptData(PrimitiveBaseShape shp, XmlTextReader reader)
{
// m_log.DebugFormat("[SCENE OBJECT SERIALIZER]: Setting sculpt data length {0}", shp.SculptData.Length);
shp.SculptData = Convert.FromBase64String(reader.ReadElementString("SculptData"));
}