From 0dbd96a12f08741da45adfb84f7d757a6f557875 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Tue, 4 Jan 2011 10:19:21 -0800 Subject: [PATCH] Modify remote physics configuration to work with new object sync. Remove some chatty debug messages --- .../PhysEngineToSceneConnectorModule.cs | 2 +- .../SymmetricSync/RegionSyncModule.cs | 4 ++-- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 +- OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 ++-- OpenSim/Region/Physics/PEPlugin/PEPrim.cs | 16 ++++++++-------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs index fa85318920..8a8a92c7d9 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs @@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule IConfig syncConfig = config.Configs["RegionSyncModule"]; if (syncConfig != null && syncConfig.GetBoolean("Enabled", false) - && syncConfig.GetString("Mode", "").ToLower() == "client" + // && syncConfig.GetString("Mode", "").ToLower() == "client" && syncConfig.GetBoolean("PhysEngineClient", false) ) { diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs index 3b9ca5f3eb..ea6aaf587a 100755 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs @@ -302,7 +302,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule #endregion //IRegionSyncModule #region ICommandableModule Members - private readonly Commander m_commander = new Commander("sync"); + private readonly Commander m_commander = new Commander("ssync"); public ICommander CommandInterface { get { return m_commander; } @@ -340,7 +340,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule /// Commandline arguments private void EventManager_OnPluginConsole(string[] args) { - if (args[0] == "sync") + if (args[0] == "ssync") { if (args.Length == 1) { diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index c885fc4e7e..9adc419de7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -457,7 +457,7 @@ namespace OpenSim.Region.Framework.Scenes lock (m_updateList) { m_updateList[obj.UUID] = obj; - m_log.Debug("added " + obj.UUID + " to m_updateList"); + // m_log.Debug("added " + obj.UUID + " to m_updateList"); } } diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index bc5066fa18..1b0feec8c4 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs @@ -253,8 +253,8 @@ namespace OpenSim.Region.Physics.OdePlugin m_taintadd = true; _parent_scene.AddPhysicsActorTaint(this); // don't do .add() here; old geoms get recycled with the same hash - m_log.DebugFormat("[PHYSICS] Created ODEPrim: n={0}, m={1}, pbs={2}, phys={3}", - primName, mesh == null ? "NULL" : "DEFINED", pbs == null ? "NULL" : "DEFINED", pisPhysical); + // m_log.DebugFormat("[PHYSICS] Created ODEPrim: n={0}, m={1}, pbs={2}, phys={3}", + // primName, mesh == null ? "NULL" : "DEFINED", pbs == null ? "NULL" : "DEFINED", pisPhysical); } public override void RequestPhysicsterseUpdate() diff --git a/OpenSim/Region/Physics/PEPlugin/PEPrim.cs b/OpenSim/Region/Physics/PEPlugin/PEPrim.cs index 528ef7064c..793e098e35 100755 --- a/OpenSim/Region/Physics/PEPlugin/PEPrim.cs +++ b/OpenSim/Region/Physics/PEPlugin/PEPrim.cs @@ -81,7 +81,7 @@ public sealed class PEPrim : PhysicsActor _position = pos; _size = size; _orientation = rotation; - // SendCreatePrim(primName, parent_scene, pos, size, rotation, mesh, pbs, pisPhysical, dode); + // m_log.DebugFormat("[REMOTE PRIM ENGINE] PEPrim creation of {0}", primName); } public override bool Stopped { @@ -90,21 +90,21 @@ public sealed class PEPrim : PhysicsActor public override Vector3 Size { get { return _size; } set { _size = value; - // m_log.Debug("[RPE] PEPrim set Size"); + // m_log.Debug("[REMOTE PRIM ENGINE] PEPrim set Size"); ChangingActorID = RegionSyncServerModule.ActorID; Prop.Set(_localID, PropType.Size, _size); } } public override PrimitiveBaseShape Shape { set { _pbs = value; - m_log.Debug("[RPE] PEPrim set Shape"); + m_log.Debug("[REMOTE PRIM ENGINE] PEPrim set Shape"); ChangingActorID = RegionSyncServerModule.ActorID; Prop.Set(_localID, PropType.Shape, _pbs); } } public override uint LocalID { set { _localID = value; - // m_log.Debug("[RPE] PEPrim set LocalID"); + // m_log.Debug("[REMOTE PRIM ENGINE] PEPrim set LocalID"); ChangingActorID = RegionSyncServerModule.ActorID; Prop.Set(_localID, PropType.LocalID, _localID); } @@ -112,13 +112,13 @@ public sealed class PEPrim : PhysicsActor } public override bool Grabbed { set { _grabbed = value; - m_log.Debug("[RPE] PEPrim set Grabbed"); + m_log.Debug("[REMOTE PRIM ENGINE] PEPrim set Grabbed"); Prop.Set(_localID, PropType.Grabbed, _grabbed); } } public override bool Selected { set { _selected = value; - m_log.Debug("[RPE] PEPrim set Selected"); + m_log.Debug("[REMOTE PRIM ENGINE] PEPrim set Selected"); Prop.Set(_localID, PropType.Selected, _selected); } } @@ -131,7 +131,7 @@ public sealed class PEPrim : PhysicsActor get { return _position; } set { _position = value; ChangingActorID = RegionSyncServerModule.ActorID; - // m_log.Debug("[RPE] PEPrim set Position"); + // m_log.Debug("[REMOTE PRIM ENGINE] PEPrim set Position"); Prop.Set(_localID, PropType.Position, _position); } } @@ -142,7 +142,7 @@ public sealed class PEPrim : PhysicsActor get { return _force; } set { _force = value; ChangingActorID = RegionSyncServerModule.ActorID; - // m_log.Debug("[RPE] PEPrim set Force"); + // m_log.Debug("[REMOTE PRIM ENGINE] PEPrim set Force"); Prop.Set(_localID, PropType.Force, _force); } }