OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modify remote physics configuration to work with new object sync. Remove some chatty debug messages

dsg
Robert Adams 2011-01-04 10:19:21 -08:00
parent 7da71bd30d
commit 0dbd96a12f
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs
View File

@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
IConfig syncConfig = config.Configs["RegionSyncModule"]; IConfig syncConfig = config.Configs["RegionSyncModule"];
if (syncConfig != null if (syncConfig != null
&& syncConfig.GetBoolean("Enabled", false) && syncConfig.GetBoolean("Enabled", false)
&& syncConfig.GetString("Mode", "").ToLower() == "client" // && syncConfig.GetString("Mode", "").ToLower() == "client"
&& syncConfig.GetBoolean("PhysEngineClient", false) && syncConfig.GetBoolean("PhysEngineClient", false)
) )
{ {

4
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
View File

@ -302,7 +302,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
#endregion //IRegionSyncModule #endregion //IRegionSyncModule
#region ICommandableModule Members #region ICommandableModule Members
private readonly Commander m_commander = new Commander("sync"); private readonly Commander m_commander = new Commander("ssync");
public ICommander CommandInterface public ICommander CommandInterface
{ {
get { return m_commander; } get { return m_commander; }
@ -340,7 +340,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
/// <param name="args">Commandline arguments</param> /// <param name="args">Commandline arguments</param>
private void EventManager_OnPluginConsole(string[] args) private void EventManager_OnPluginConsole(string[] args)
{ {
if (args[0] == "sync") if (args[0] == "ssync")
{ {
if (args.Length == 1) if (args.Length == 1)
{ {

2
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -457,7 +457,7 @@ namespace OpenSim.Region.Framework.Scenes
lock (m_updateList) lock (m_updateList)
{ {
m_updateList[obj.UUID] = obj; m_updateList[obj.UUID] = obj;
m_log.Debug("added " + obj.UUID + " to m_updateList"); // m_log.Debug("added " + obj.UUID + " to m_updateList");
} }
} }

4
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -253,8 +253,8 @@ namespace OpenSim.Region.Physics.OdePlugin
m_taintadd = true; m_taintadd = true;
_parent_scene.AddPhysicsActorTaint(this); _parent_scene.AddPhysicsActorTaint(this);
// don't do .add() here; old geoms get recycled with the same hash // 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}", // m_log.DebugFormat("[PHYSICS] Created ODEPrim: n={0}, m={1}, pbs={2}, phys={3}",
primName, mesh == null ? "NULL" : "DEFINED", pbs == null ? "NULL" : "DEFINED", pisPhysical); // primName, mesh == null ? "NULL" : "DEFINED", pbs == null ? "NULL" : "DEFINED", pisPhysical);
} }
public override void RequestPhysicsterseUpdate() public override void RequestPhysicsterseUpdate()

16
OpenSim/Region/Physics/PEPlugin/PEPrim.cs
View File

@ -81,7 +81,7 @@ public sealed class PEPrim : PhysicsActor
_position = pos; _position = pos;
_size = size; _size = size;
_orientation = rotation; _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 { public override bool Stopped {
@ -90,21 +90,21 @@ public sealed class PEPrim : PhysicsActor
public override Vector3 Size { public override Vector3 Size {
get { return _size; } get { return _size; }
set { _size = value; set { _size = value;
// m_log.Debug("[RPE] PEPrim set Size"); // m_log.Debug("[REMOTE PRIM ENGINE] PEPrim set Size");
ChangingActorID = RegionSyncServerModule.ActorID; ChangingActorID = RegionSyncServerModule.ActorID;
Prop.Set(_localID, PropType.Size, _size); Prop.Set(_localID, PropType.Size, _size);
} }
} }
public override PrimitiveBaseShape Shape { public override PrimitiveBaseShape Shape {
set { _pbs = value; set { _pbs = value;
m_log.Debug("[RPE] PEPrim set Shape"); m_log.Debug("[REMOTE PRIM ENGINE] PEPrim set Shape");
ChangingActorID = RegionSyncServerModule.ActorID; ChangingActorID = RegionSyncServerModule.ActorID;
Prop.Set(_localID, PropType.Shape, _pbs); Prop.Set(_localID, PropType.Shape, _pbs);
} }
} }
public override uint LocalID { public override uint LocalID {
set { _localID = value; set { _localID = value;
// m_log.Debug("[RPE] PEPrim set LocalID"); // m_log.Debug("[REMOTE PRIM ENGINE] PEPrim set LocalID");
ChangingActorID = RegionSyncServerModule.ActorID; ChangingActorID = RegionSyncServerModule.ActorID;
Prop.Set(_localID, PropType.LocalID, _localID); Prop.Set(_localID, PropType.LocalID, _localID);
} }
@ -112,13 +112,13 @@ public sealed class PEPrim : PhysicsActor
} }
public override bool Grabbed { public override bool Grabbed {
set { _grabbed = value; 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); Prop.Set(_localID, PropType.Grabbed, _grabbed);
} }
} }
public override bool Selected { public override bool Selected {
set { _selected = value; 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); Prop.Set(_localID, PropType.Selected, _selected);
} }
} }
@ -131,7 +131,7 @@ public sealed class PEPrim : PhysicsActor
get { return _position; } get { return _position; }
set { _position = value; set { _position = value;
ChangingActorID = RegionSyncServerModule.ActorID; 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); Prop.Set(_localID, PropType.Position, _position);
} }
} }
@ -142,7 +142,7 @@ public sealed class PEPrim : PhysicsActor
get { return _force; } get { return _force; }
set { _force = value; set { _force = value;
ChangingActorID = RegionSyncServerModule.ActorID; 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); Prop.Set(_localID, PropType.Force, _force);
} }
} }