From f8ccfaf0462a5643d12ad01aadf3787394f69817 Mon Sep 17 00:00:00 2001 From: "Huaiyu (Kitty) Liu" Date: Fri, 12 Nov 2010 15:50:21 -0800 Subject: [PATCH] Fixed a few conflicts with Dan's code (earlier conflict resolution by Dan broke remote script engine's execution) to make remote script engine execute as it did in the implementation in Country Fair 2010 demo. --- .../RegionSyncModule/RegionSyncServerModule.cs | 4 ++-- OpenSim/Region/Framework/Scenes/Scene.cs | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs index 4f6899de58..fbd79b496c 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs @@ -414,8 +414,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule { get { - if (m_server == null || !m_server.Synced) - //if((m_server == null || !m_server.Synced) && (m_sceneToSESyncServer==null || !m_sceneToSESyncServer.Synced)) + //if (m_server == null || !m_server.Synced) + if((m_server == null || !m_server.Synced) && (m_sceneToSESyncServer==null || !m_sceneToSESyncServer.Synced)) return false; return true; } diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f93832147c..2783269ca5 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1644,7 +1644,8 @@ namespace OpenSim.Region.Framework.Scenes int tmpPhysicsMS2 = Util.EnvironmentTickCount(); // Do not simulate physics locally if this is a synced client - if (!IsSyncedClient()) + //if (!IsSyncedClient()) + if (IsSyncedServer()) { if ((m_frame % m_update_physics == 0) && m_physics_enabled) m_sceneGraph.UpdatePreparePhysics(); @@ -1652,7 +1653,8 @@ namespace OpenSim.Region.Framework.Scenes physicsMS2 = Util.EnvironmentTickCountSubtract(tmpPhysicsMS2); // Do not simulate physics locally if this is a synced client - if (!IsSyncedClient()) + //if (!IsSyncedClient()) + if (IsSyncedServer()) { if (m_frame % m_update_entitymovement == 0) m_sceneGraph.UpdateScenePresenceMovement(); @@ -1660,7 +1662,8 @@ namespace OpenSim.Region.Framework.Scenes int tmpPhysicsMS = Util.EnvironmentTickCount(); // Do not simulate physics locally if this is a synced client - if (!IsSyncedClient()) + //if (!IsSyncedClient()) + if (IsSyncedServer()) { if (m_frame % m_update_physics == 0) {