aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordan miller2007-09-01 11:06:48 +0000
committerdan miller2007-09-01 11:06:48 +0000
commit00d4d5a21b22adae26ddba7ca89bac1eee0517f1 (patch)
tree88bba5d3809af17b9d492340295e1fb31bb95a72
parentumm, nevermind all that -- this is the real ODE region fix. I'll get subvers... (diff)
downloadopensim-SC-00d4d5a21b22adae26ddba7ca89bac1eee0517f1.zip
opensim-SC-00d4d5a21b22adae26ddba7ca89bac1eee0517f1.tar.gz
opensim-SC-00d4d5a21b22adae26ddba7ca89bac1eee0517f1.tar.bz2
opensim-SC-00d4d5a21b22adae26ddba7ca89bac1eee0517f1.tar.xz
once more, without the debug statements (ODE multi-region fixes, various debugging)
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs1
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 233b043..718cd9d 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Physics.Manager
93 IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 93 IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
94 plug.Init(); 94 plug.Init();
95 this._plugins.Add(plug.GetName(),plug); 95 this._plugins.Add(plug.GetName(),plug);
96 Console.WriteLine("-----------------------------------------added physics eng: " + plug.GetName()); 96 Console.WriteLine("added physics engine: " + plug.GetName());
97 97
98 } 98 }
99 99
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 7141f09..18e78d7 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -164,7 +164,6 @@ namespace OpenSim.Region.Physics.OdePlugin
164 164
165 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation) 165 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
166 { 166 {
167 Console.WriteLine("++++++++++++++++++++++++++++++++++ AddPrim: " + position);
168 PhysicsVector pos = new PhysicsVector(); 167 PhysicsVector pos = new PhysicsVector();
169 pos.X = position.X; 168 pos.X = position.X;
170 pos.Y = position.Y; 169 pos.Y = position.Y;