diff options
author | Justin Clark-Casey (justincc) | 2011-06-10 20:42:15 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-06-10 20:42:15 +0100 |
commit | 08db3c5a8e6c93c03b1f623c83af9dbb84200b42 (patch) | |
tree | a40a50db3bd46926736bcb3be151a1349d60859a /OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |
parent | minor: Add some commented out destructor logging messages for potential futur... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-08db3c5a8e6c93c03b1f623c83af9dbb84200b42.zip opensim-SC-08db3c5a8e6c93c03b1f623c83af9dbb84200b42.tar.gz opensim-SC-08db3c5a8e6c93c03b1f623c83af9dbb84200b42.tar.bz2 opensim-SC-08db3c5a8e6c93c03b1f623c83af9dbb84200b42.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 6 |
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 | ||