diff options
author | dahlia | 2013-05-15 17:12:17 -0700 |
---|---|---|
committer | dahlia | 2013-05-15 17:12:17 -0700 |
commit | 46eb8465a01b7dd923b962035562c953d4eb78e4 (patch) | |
tree | 0932f5334c503a45a49158d6cde93af70e9ae95d /OpenSim/Region | |
parent | Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686b (diff) | |
download | opensim-SC_OLD-46eb8465a01b7dd923b962035562c953d4eb78e4.zip opensim-SC_OLD-46eb8465a01b7dd923b962035562c953d4eb78e4.tar.gz opensim-SC_OLD-46eb8465a01b7dd923b962035562c953d4eb78e4.tar.bz2 opensim-SC_OLD-46eb8465a01b7dd923b962035562c953d4eb78e4.tar.xz |
fall back to using a display mesh for physics proxy if no physics_mesh entry was wound in a mesh asset
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 8145d61..2d102de 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -358,6 +358,10 @@ namespace OpenSim.Region.Physics.Meshing | |||
358 | physicsParms = (OSDMap)map["physics_shape"]; // old asset format | 358 | physicsParms = (OSDMap)map["physics_shape"]; // old asset format |
359 | else if (map.ContainsKey("physics_mesh")) | 359 | else if (map.ContainsKey("physics_mesh")) |
360 | physicsParms = (OSDMap)map["physics_mesh"]; // new asset format | 360 | physicsParms = (OSDMap)map["physics_mesh"]; // new asset format |
361 | else if (map.ContainsKey("medium_lod")) | ||
362 | physicsParms = (OSDMap)map["medium_lod"]; // if no physics mesh, try to fall back to medium LOD display mesh | ||
363 | else if (map.ContainsKey("high_lod")) | ||
364 | physicsParms = (OSDMap)map["high_lod"]; // if all else fails, use highest LOD display mesh and hope it works :) | ||
361 | 365 | ||
362 | if (physicsParms == null) | 366 | if (physicsParms == null) |
363 | { | 367 | { |