aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-08 11:32:56 +0000
committerTeravus Ovares2008-02-08 11:32:56 +0000
commit50acb8e634cfb85c6e6c76e72b99bea459bfe746 (patch)
tree0235c28e7dbb600a48295efd68bfb1ce43941444 /OpenSim/Region/Physics/OdePlugin
parent* Fix: Send Parcel data on region crossing. (diff)
downloadopensim-SC_OLD-50acb8e634cfb85c6e6c76e72b99bea459bfe746.zip
opensim-SC_OLD-50acb8e634cfb85c6e6c76e72b99bea459bfe746.tar.gz
opensim-SC_OLD-50acb8e634cfb85c6e6c76e72b99bea459bfe746.tar.bz2
opensim-SC_OLD-50acb8e634cfb85c6e6c76e72b99bea459bfe746.tar.xz
* This update adds limited support for Cylinder meshed prim in the Meshmerizer plugin. (Limited because path cut is wrongly offset and while Hollowing works, you can walk through the inside wall.)
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs12
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs3
2 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 690e9d3..aa80a84 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -127,6 +127,18 @@ namespace OpenSim.Region.Physics.OdePlugin
127 m_targetSpace = _parent_scene.space; 127 m_targetSpace = _parent_scene.space;
128 } 128 }
129 m_primName = primName; 129 m_primName = primName;
130 if (mesh != null)
131 {
132 }
133 else
134 {
135 if (_parent_scene.needsMeshing(_pbs))
136 {
137 // Don't need to re-enable body.. it's done in SetMesh
138 mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size);
139 // createmesh returns null when it's a shape that isn't a cube.
140 }
141 }
130 142
131 lock (OdeScene.OdeLock) 143 lock (OdeScene.OdeLock)
132 { 144 {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 9cf6d50..37b8fb9 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1011,6 +1011,9 @@ namespace OpenSim.Region.Physics.OdePlugin
1011 if ((pbs.ProfileBegin != 0) || pbs.ProfileEnd != 0) 1011 if ((pbs.ProfileBegin != 0) || pbs.ProfileEnd != 0)
1012 return true; 1012 return true;
1013 1013
1014 if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight)
1015 return true;
1016
1014 return false; 1017 return false;
1015 } 1018 }
1016 1019