diff options
author | Justin Clark-Casey (justincc) | 2011-07-09 00:35:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-09 00:35:30 +0100 |
commit | 5e8900dfd058bd103cb6dcf8a57dc94683efd878 (patch) | |
tree | a9962c79801fd6a3181fb72d026ae84e5c1097cd /OpenSim/Region/Framework | |
parent | When loading library asset set, only store an asset if it's different from an... (diff) | |
download | opensim-SC_OLD-5e8900dfd058bd103cb6dcf8a57dc94683efd878.zip opensim-SC_OLD-5e8900dfd058bd103cb6dcf8a57dc94683efd878.tar.gz opensim-SC_OLD-5e8900dfd058bd103cb6dcf8a57dc94683efd878.tar.bz2 opensim-SC_OLD-5e8900dfd058bd103cb6dcf8a57dc94683efd878.tar.xz |
minor: code tidy and inserted log lines for future use.
Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does
After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory
When phantom is toggled, the sculptdata is regenerated before remeshing.
But on resize, the sculptdata is not regenerated.
So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index cd5046a..307c92a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2958,7 +2958,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2958 | } | 2958 | } |
2959 | } | 2959 | } |
2960 | 2960 | ||
2961 | |||
2962 | public void SculptTextureCallback(UUID textureID, AssetBase texture) | 2961 | public void SculptTextureCallback(UUID textureID, AssetBase texture) |
2963 | { | 2962 | { |
2964 | if (m_shape.SculptEntry) | 2963 | if (m_shape.SculptEntry) |
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 | ||