aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs36
1 files changed, 17 insertions, 19 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index e86a5b6..3b12b17 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -128,7 +128,6 @@ namespace OpenSim.Region.Physics.OdePlugin
128 private bool m_taintPhysics; 128 private bool m_taintPhysics;
129 private bool m_collidesLand = true; 129 private bool m_collidesLand = true;
130 private bool m_collidesWater; 130 private bool m_collidesWater;
131 public bool m_returnCollisions;
132 131
133 // Default we're a Geometry 132 // Default we're a Geometry
134 private CollisionCategories m_collisionCategories = (CollisionCategories.Geom); 133 private CollisionCategories m_collisionCategories = (CollisionCategories.Geom);
@@ -136,16 +135,15 @@ namespace OpenSim.Region.Physics.OdePlugin
136 // Default, Collide with Other Geometries, spaces and Bodies 135 // Default, Collide with Other Geometries, spaces and Bodies
137 private CollisionCategories m_collisionFlags = m_default_collisionFlags; 136 private CollisionCategories m_collisionFlags = m_default_collisionFlags;
138 137
139 public bool m_taintremove; 138 public bool m_taintremove { get; private set; }
140 public bool m_taintdisable; 139 public bool m_taintdisable { get; private set; }
141 public bool m_disabled; 140 internal bool m_disabled;
142 public bool m_taintadd; 141 public bool m_taintadd { get; private set; }
143 public bool m_taintselected; 142 public bool m_taintselected { get; private set; }
144 public bool m_taintCollidesWater; 143 public bool m_taintCollidesWater { get; private set; }
145 144
146 public uint m_localID; 145 public uint m_localID { get; private set; }
147 146
148 //public GCHandle gc;
149 private CollisionLocker ode; 147 private CollisionLocker ode;
150 148
151 private bool m_taintforce = false; 149 private bool m_taintforce = false;
@@ -162,8 +160,8 @@ namespace OpenSim.Region.Physics.OdePlugin
162 /// </summary> 160 /// </summary>
163 public IntPtr m_targetSpace = IntPtr.Zero; 161 public IntPtr m_targetSpace = IntPtr.Zero;
164 162
165 public IntPtr prim_geom; 163 public IntPtr prim_geom { get; private set; }
166 public IntPtr _triMeshData; 164 public IntPtr _triMeshData { get; private set; }
167 165
168 private IntPtr _linkJointGroup = IntPtr.Zero; 166 private IntPtr _linkJointGroup = IntPtr.Zero;
169 private PhysicsActor _parent; 167 private PhysicsActor _parent;
@@ -178,28 +176,28 @@ namespace OpenSim.Region.Physics.OdePlugin
178 176
179 private bool m_throttleUpdates; 177 private bool m_throttleUpdates;
180 private int throttleCounter; 178 private int throttleCounter;
181 public int m_interpenetrationcount; 179 public int m_interpenetrationcount { get; private set; }
182 public float m_collisionscore; 180 internal float m_collisionscore;
183 public int m_roundsUnderMotionThreshold; 181 public int m_roundsUnderMotionThreshold { get; private set; }
184 private int m_crossingfailures; 182 private int m_crossingfailures;
185 183
186 public bool outofBounds; 184 public bool outofBounds { get; private set; }
187 private float m_density = 10.000006836f; // Aluminum g/cm3; 185 private float m_density = 10.000006836f; // Aluminum g/cm3;
188 186
189 public bool _zeroFlag; 187 public bool _zeroFlag { get; private set; }
190 private bool m_lastUpdateSent; 188 private bool m_lastUpdateSent;
191 189
192 public IntPtr Body = IntPtr.Zero; 190 public IntPtr Body = IntPtr.Zero;
193 public String Name { get; private set; } 191 public String Name { get; private set; }
194 private Vector3 _target_velocity; 192 private Vector3 _target_velocity;
195 public d.Mass pMass; 193 private d.Mass pMass;
196 194
197 public int m_eventsubscription; 195 private int m_eventsubscription;
198 private CollisionEventUpdate CollisionEventsThisFrame; 196 private CollisionEventUpdate CollisionEventsThisFrame;
199 197
200 private IntPtr m_linkJoint = IntPtr.Zero; 198 private IntPtr m_linkJoint = IntPtr.Zero;
201 199
202 public volatile bool childPrim; 200 internal volatile bool childPrim;
203 201
204 private ODEDynamics m_vehicle; 202 private ODEDynamics m_vehicle;
205 203