diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 0746b06..980f7a3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1603,6 +1603,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1603 | /// <param name="m_physicalPrim"></param> | 1603 | /// <param name="m_physicalPrim"></param> |
1604 | public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim) | 1604 | public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim) |
1605 | { | 1605 | { |
1606 | // m_log.DebugFormat("[SCENE OBJECT PART]: Applying physics to {0} {1} {2}", Name, LocalId, UUID); | ||
1607 | |||
1606 | bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim); | 1608 | bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim); |
1607 | bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0); | 1609 | bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0); |
1608 | 1610 | ||
@@ -2974,7 +2976,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2974 | } | 2976 | } |
2975 | } | 2977 | } |
2976 | 2978 | ||
2977 | |||
2978 | public void SculptTextureCallback(UUID textureID, AssetBase texture) | 2979 | public void SculptTextureCallback(UUID textureID, AssetBase texture) |
2979 | { | 2980 | { |
2980 | if (m_shape.SculptEntry) | 2981 | if (m_shape.SculptEntry) |
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 | ||