From 2122c336b088ebb2900cf6cd061602dda01268e0 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 28 May 2012 14:44:06 +0100
Subject: a bit cleaner code (?) on sculpts/meshs meshing checking
---
OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index b0bc18b..286c7f0 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -1675,20 +1675,17 @@ namespace OpenSim.Region.Physics.OdePlugin
/// <returns></returns>
public bool needsMeshing(PrimitiveBaseShape pbs)
{
-
// check sculpts or meshs
if (pbs.SculptEntry)
{
- if (pbs.SculptType == (byte)SculptType.Mesh) // always do meshs
+ if (meshSculptedPrim)
return true;
- if (!meshSculptedPrim)
- return false;
- else
+ if (pbs.SculptType == (byte)SculptType.Mesh) // always do meshs
return true;
- }
- int iPropertiesNotSupportedDefault = 0;
+ return false;
+ }
if (forceSimplePrimMeshing)
return true;
@@ -1719,6 +1716,8 @@ namespace OpenSim.Region.Physics.OdePlugin
// and it's odd.. so for now just return true if asked to force meshs
// hopefully mesher will fail if doesn't suport so things still get basic boxes
+ int iPropertiesNotSupportedDefault = 0;
+
if (pbs.ProfileHollow != 0)
iPropertiesNotSupportedDefault++;
--
cgit v1.1