aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-05 14:17:18 -0400
committerJonathan Freedman2010-10-05 14:17:18 -0400
commit8f1acb890ac49ea004bf43065ce8d3472bb27708 (patch)
tree07e4e5fc77f764232c958bdbf8f93f2651da1663 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.zip
opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.gz
opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.bz2
opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index c37c9bd..c91658e 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -188,7 +188,7 @@ namespace OpenSim.Region.Physics.OdePlugin
188 public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, 188 public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size,
189 Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode) 189 Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode)
190 { 190 {
191 Name = primName; 191 Name = primName;
192 m_vehicle = new ODEDynamics(); 192 m_vehicle = new ODEDynamics();
193 //gc = GCHandle.Alloc(prim_geom, GCHandleType.Pinned); 193 //gc = GCHandle.Alloc(prim_geom, GCHandleType.Pinned);
194 ode = dode; 194 ode = dode;
@@ -620,7 +620,7 @@ namespace OpenSim.Region.Physics.OdePlugin
620 volume *= (1.0f - hollowVolume); 620 volume *= (1.0f - hollowVolume);
621 } 621 }
622 } 622 }
623 break; 623 break;
624 624
625 default: 625 default:
626 break; 626 break;
@@ -658,7 +658,7 @@ namespace OpenSim.Region.Physics.OdePlugin
658 658
659 taperY = _pbs.PathTaperY * 0.01f; 659 taperY = _pbs.PathTaperY * 0.01f;
660 if (taperY < 0.0f) 660 if (taperY < 0.0f)
661 taperY = -taperY; 661 taperY = -taperY;
662 taperY1 = 1.0f - taperY; 662 taperY1 = 1.0f - taperY;
663 663
664 } 664 }
@@ -1059,7 +1059,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1059 } 1059 }
1060 1060
1061 foreach (OdePrim prm in childrenPrim) 1061 foreach (OdePrim prm in childrenPrim)
1062 { 1062 {
1063 prm.m_collisionCategories |= CollisionCategories.Body; 1063 prm.m_collisionCategories |= CollisionCategories.Body;
1064 prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind); 1064 prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
1065 1065