aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-07-22 00:00:46 +0100
committerUbitUmarov2017-07-22 00:00:46 +0100
commit98c64f1aa9b8d824b9cf5921632ef784a3c5be1f (patch)
treeeb6f2c30f131a8f0834cbeece0b289c5eed14b72
parentshape convex should not trigger complex cost (LI) alone (diff)
downloadopensim-SC_OLD-98c64f1aa9b8d824b9cf5921632ef784a3c5be1f.zip
opensim-SC_OLD-98c64f1aa9b8d824b9cf5921632ef784a3c5be1f.tar.gz
opensim-SC_OLD-98c64f1aa9b8d824b9cf5921632ef784a3c5be1f.tar.bz2
opensim-SC_OLD-98c64f1aa9b8d824b9cf5921632ef784a3c5be1f.tar.xz
ubOde remove ols pseudo convex for sculpts
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs11
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
index dc87a78..3f40170 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
@@ -425,17 +425,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
425 Vector3 size = repData.size; 425 Vector3 size = repData.size;
426 426
427 int clod = (int)LevelOfDetail.High; 427 int clod = (int)LevelOfDetail.High;
428 bool convex;
429 byte shapetype = repData.shapetype; 428 byte shapetype = repData.shapetype;
430 if (shapetype == 0) 429 bool convex = shapetype == 2;
431 convex = false;
432 else
433 {
434 convex = true;
435 // sculpts pseudo convex
436 if (pbs.SculptEntry && pbs.SculptType != (byte)SculptType.Mesh)
437 clod = (int)LevelOfDetail.Low;
438 }
439 430
440 mesh = m_mesher.GetMesh(actor.Name, pbs, size, clod, true, convex); 431 mesh = m_mesher.GetMesh(actor.Name, pbs, size, clod, true, convex);
441 432