diff options
| author | Diva Canto | 2011-06-10 09:17:06 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-06-10 09:17:06 -0700 |
| commit | eeac2275c9f8a826e8612c64241daeb2ace1d866 (patch) | |
| tree | dcd8a3d415f2596bff6b7bcc1b0650c7cea62f10 /OpenSim/Region/Physics | |
| parent | New method for resetting the map on HG: do it only once upon changing grids, ... (diff) | |
| parent | partial update for new mesh asset format - handle both old and new formats fo... (diff) | |
| download | opensim-SC-eeac2275c9f8a826e8612c64241daeb2ace1d866.zip opensim-SC-eeac2275c9f8a826e8612c64241daeb2ace1d866.tar.gz opensim-SC-eeac2275c9f8a826e8612c64241daeb2ace1d866.tar.bz2 opensim-SC-eeac2275c9f8a826e8612c64241daeb2ace1d866.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics')
| -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 | ||