aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
authorCharles Krinke2008-03-21 16:52:55 +0000
committerCharles Krinke2008-03-21 16:52:55 +0000
commit21e5e65bb7743fd95f1a812f35b894b32fdf6228 (patch)
treea656ddff278506dfff4cd1e42057aa5be19557de /OpenSim/Region/Physics/OdePlugin
parentImplemented llOverMyLand() and correct llGetOwnerKey() to properly return the... (diff)
downloadopensim-SC_OLD-21e5e65bb7743fd95f1a812f35b894b32fdf6228.zip
opensim-SC_OLD-21e5e65bb7743fd95f1a812f35b894b32fdf6228.tar.gz
opensim-SC_OLD-21e5e65bb7743fd95f1a812f35b894b32fdf6228.tar.bz2
opensim-SC_OLD-21e5e65bb7743fd95f1a812f35b894b32fdf6228.tar.xz
Comment out "m_randomizeWater" and "ms" until we use them later.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index a9d7079..abac967 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -160,12 +160,14 @@ namespace OpenSim.Region.Physics.OdePlugin
160 private d.Contact WaterContact; 160 private d.Contact WaterContact;
161 161
162 162
163 private int m_randomizeWater = 200; 163//Ckrinke: Comment out until used. We declare it, initialize it, but do not use it
164//Ckrinke private int m_randomizeWater = 200;
164 private int m_physicsiterations = 10; 165 private int m_physicsiterations = 10;
165 private float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag 166 private float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag
166 private PhysicsActor PANull = new NullPhysicsActor(); 167 private PhysicsActor PANull = new NullPhysicsActor();
167 private float step_time = 0.0f; 168 private float step_time = 0.0f;
168 private int ms = 0; 169//Ckrinke: Comment out until used. We declare it, initialize it, but do not use it
170//Ckrinke private int ms = 0;
169 public IntPtr world; 171 public IntPtr world;
170 private bool returncollisions = false; 172 private bool returncollisions = false;
171 private uint obj1LocalID = 0; 173 private uint obj1LocalID = 0;