diff options
author | Dahlia Trimble | 2008-12-18 17:53:38 +0000 |
---|---|---|
committer | Dahlia Trimble | 2008-12-18 17:53:38 +0000 |
commit | 2537a4098a3df5fbde726a3817c85c67013d090b (patch) | |
tree | 6229a3a804f0e3782734c2a03f85690aa52793cd /OpenSim/Region | |
parent | * Apply http://opensimulator.org/mantis/view.php?id=2810 (diff) | |
download | opensim-SC_OLD-2537a4098a3df5fbde726a3817c85c67013d090b.zip opensim-SC_OLD-2537a4098a3df5fbde726a3817c85c67013d090b.tar.gz opensim-SC_OLD-2537a4098a3df5fbde726a3817c85c67013d090b.tar.bz2 opensim-SC_OLD-2537a4098a3df5fbde726a3817c85c67013d090b.tar.xz |
Enabled complex meshing for simple box prims with non-zero shear
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index d1a3ce7..7589750 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -1691,7 +1691,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1691 | return false; | 1691 | return false; |
1692 | } | 1692 | } |
1693 | 1693 | ||
1694 | // if it's a standard box or sphere with no cuts or hollows or twist, return false since ODE can use an internal representation for the prim | 1694 | // if it's a standard box or sphere with no cuts, hollows, twist or top shear, return false since ODE can use an internal representation for the prim |
1695 | if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight) | 1695 | if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight) |
1696 | || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1 | 1696 | || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1 |
1697 | && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z)) | 1697 | && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z)) |
@@ -1702,7 +1702,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1702 | && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0 | 1702 | && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0 |
1703 | && pbs.PathBegin == 0 && pbs.PathEnd == 0 | 1703 | && pbs.PathBegin == 0 && pbs.PathEnd == 0 |
1704 | && pbs.PathTaperX == 0 && pbs.PathTaperY == 0 | 1704 | && pbs.PathTaperX == 0 && pbs.PathTaperY == 0 |
1705 | && pbs.PathScaleX == 100 && pbs.PathScaleY == 100) | 1705 | && pbs.PathScaleX == 100 && pbs.PathScaleY == 100 |
1706 | && pbs.PathShearX == 0 && pbs.PathShearY == 0) | ||
1706 | { | 1707 | { |
1707 | #if SPAM | 1708 | #if SPAM |
1708 | m_log.Warn("NonMesh"); | 1709 | m_log.Warn("NonMesh"); |