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

Fixed a problem with PhysEngineToSceneConnectorModule.cs disabling regionsync when physics syncing is disabled.

dsg
Dan Lake 2011-01-07 08:27:06 -08:00
parent 046ec22924
commit 9d7fd472c0
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,11 +91,11 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
&& syncConfig.GetBoolean("PhysEngineClient", false) && syncConfig.GetBoolean("PhysEngineClient", false)
) )
{ {
scene.RegionSyncEnabled = true; //scene.RegionSyncEnabled = true;
} }
else else
{ {
scene.RegionSyncEnabled = false; //scene.RegionSyncEnabled = false;
m_log.Warn(LogHeader + ": Not in physics engine client mode. Shutting down."); m_log.Warn(LogHeader + ": Not in physics engine client mode. Shutting down.");
return; return;
} }

7
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
View File

@ -469,6 +469,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
return; return;
} }
// m_log.WarnFormat("{0}: UpdatedAvatar JSON: {1}", LogHeader(), data.ToString());
// Find the presence in the scene and error check // Find the presence in the scene and error check
ScenePresence presence; ScenePresence presence;
m_scene.TryGetScenePresence(agentID, out presence); m_scene.TryGetScenePresence(agentID, out presence);
@ -558,13 +559,11 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{ {
m_log.ErrorFormat("{0} Caught exception in UpdatedAvatar handler (TrySetMovementAnimation): {1}", LogHeader(), e.Message); m_log.ErrorFormat("{0} Caught exception in UpdatedAvatar handler (TrySetMovementAnimation): {1}", LogHeader(), e.Message);
} }
/* string result = String.Format("Avatar \"{0}\" ({1}) ({2}) updated (pos:{3}, vel:{4}, rot:{5}, fly:{6})",
* result = String.Format("Avatar \"{0}\" ({1}) ({2}) updated (pos:{3}, vel:{4}, rot:{5}, fly:{6})",
presence.Name, presence.UUID.ToString(), presence.LocalId.ToString(), presence.Name, presence.UUID.ToString(), presence.LocalId.ToString(),
presence.AbsolutePosition.ToString(), presence.Velocity.ToString(), presence.AbsolutePosition.ToString(), presence.Velocity.ToString(),
presence.Rotation.ToString(), presence.PhysicsActor.Flying ? "Y" : "N"); presence.Rotation.ToString(), presence.PhysicsActor.Flying ? "Y" : "N");
HandleSuccess(msg, result); // RegionSyncMessage.HandleSuccess(LogHeader(), msg, result);
* */
return; return;
} }
case RegionSyncMessage.MsgType.RemovedAvatar: case RegionSyncMessage.MsgType.RemovedAvatar: