aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authordahlia2011-06-10 00:38:38 -0700
committerdahlia2011-06-10 00:38:38 -0700
commit387b228d68b579bf978c091d8873608e016d0c3d (patch)
tree9f6dc177951d39bbe32359dcf2dd7302c8e841f2 /OpenSim/Region/Physics
parentFor MySQL, migrate region tables to the MyISAM storage engine rather than InnoDB (diff)
downloadopensim-SC-387b228d68b579bf978c091d8873608e016d0c3d.zip
opensim-SC-387b228d68b579bf978c091d8873608e016d0c3d.tar.gz
opensim-SC-387b228d68b579bf978c091d8873608e016d0c3d.tar.bz2
opensim-SC-387b228d68b579bf978c091d8873608e016d0c3d.tar.xz
partial update for new mesh asset format - handle both old and new formats for physics mesh
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index f89b824..99b2d84 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -303,7 +303,11 @@ namespace OpenSim.Region.Physics.Meshing
303 if (meshOsd is OSDMap) 303 if (meshOsd is OSDMap)
304 { 304 {
305 OSDMap map = (OSDMap)meshOsd; 305 OSDMap map = (OSDMap)meshOsd;
306 OSDMap physicsParms = (OSDMap)map["physics_shape"]; 306 OSDMap physicsParms = (OSDMap)map["physics_shape"]; // old asset format
307
308 if (physicsParms.Count == 0)
309 physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
310
307 int physOffset = physicsParms["offset"].AsInteger() + (int)start; 311 int physOffset = physicsParms["offset"].AsInteger() + (int)start;
308 int physSize = physicsParms["size"].AsInteger(); 312 int physSize = physicsParms["size"].AsInteger();
309 313