aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-11-02 22:33:32 +0000
committerUbitUmarov2016-11-02 22:33:32 +0000
commitf29d5ad662387b97d9e881f28df584dc19fa8c07 (patch)
tree18a01e20410dce4f6b18675fa6152bf90b8e23cf
parentonly add a prim to physics in PhysicsShapeType if changing from type none. wh... (diff)
downloadopensim-SC-f29d5ad662387b97d9e881f28df584dc19fa8c07.zip
opensim-SC-f29d5ad662387b97d9e881f28df584dc19fa8c07.tar.gz
opensim-SC-f29d5ad662387b97d9e881f28df584dc19fa8c07.tar.bz2
opensim-SC-f29d5ad662387b97d9e881f28df584dc19fa8c07.tar.xz
ubOde: if a mesh does not contain data for shape type PRIM, dont collide as convex as before but just don't collide matching the type NONE viewers display in this case
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index ff10e7f..bcd1530 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -443,6 +443,11 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
443 443
444 if (physicsParms != null) 444 if (physicsParms != null)
445 usemesh = true; 445 usemesh = true;
446 else
447 {
448 m_log.WarnFormat("[MESH]: Data for PRIM shape type not found for prim {0}",primName);
449 return false;
450 }
446 } 451 }
447 452
448 if(!usemesh && (map.ContainsKey("physics_convex"))) 453 if(!usemesh && (map.ContainsKey("physics_convex")))
@@ -451,7 +456,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
451 456
452 if (physicsParms == null) 457 if (physicsParms == null)
453 { 458 {
454 m_log.WarnFormat("[MESH]: unknown mesh type for {0}",primName); 459 m_log.WarnFormat("[MESH]: unknown mesh type for prim {0}",primName);
455 return false; 460 return false;
456 } 461 }
457 462