From 9d7fd472c04cb06b4617b62ccb563cfcca99f081 Mon Sep 17 00:00:00 2001
From: Dan Lake <dan.lake@intel.com>
Date: Fri, 7 Jan 2011 08:27:06 -0800
Subject: [PATCH] Fixed a problem with PhysEngineToSceneConnectorModule.cs
 disabling regionsync when physics syncing is disabled.

---
 .../RegionSyncModule/PhysEngineToSceneConnectorModule.cs   | 4 ++--
 .../RegionSync/RegionSyncModule/RegionSyncClient.cs        | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs
index caa6277035..898141f8a7 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs
@@ -91,11 +91,11 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
                     && syncConfig.GetBoolean("PhysEngineClient", false)
                 )
             {
-                scene.RegionSyncEnabled = true;
+                //scene.RegionSyncEnabled = true;
             }
             else
             {
-                scene.RegionSyncEnabled = false;
+                //scene.RegionSyncEnabled = false;
                 m_log.Warn(LogHeader + ": Not in physics engine client mode. Shutting down.");
                 return;
             }
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
index baf0b57454..6af4b97dc6 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
@@ -469,6 +469,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
                             return;
                         }
 
+                        // m_log.WarnFormat("{0}: UpdatedAvatar JSON: {1}", LogHeader(), data.ToString());
                         // Find the presence in the scene and error check
                         ScenePresence 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);
                         }
-                        /*
-                         * result = String.Format("Avatar \"{0}\" ({1}) ({2}) updated (pos:{3}, vel:{4}, rot:{5}, fly:{6})",
+                        string 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.AbsolutePosition.ToString(), presence.Velocity.ToString(), 
                                 presence.Rotation.ToString(), presence.PhysicsActor.Flying ? "Y" : "N");
-                           HandleSuccess(msg, result);
-                         * */
+                        // RegionSyncMessage.HandleSuccess(LogHeader(), msg, result);
                         return;
                     }
                 case RegionSyncMessage.MsgType.RemovedAvatar: