From a9608ba49ab89462c644ecb800282ef404942769 Mon Sep 17 00:00:00 2001 From: hliu19 Date: Tue, 5 Oct 2010 11:27:36 -0700 Subject: [PATCH] Fixed an unwanted warning that a point in space is not covered by any script engine, when there is no remote script engine running but that the main Scene is running a script engine locally. Fixed BroadcastToCM in RegionSyncServer.cs. --- .../RegionSyncModule/RegionSyncServer.cs | 3 ++- .../SceneToScriptEngineSyncServer.cs | 20 +++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServer.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServer.cs index 07ca8af9a8..71104e8154 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServer.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServer.cs @@ -200,7 +200,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule //m_log.Debug("SOG " + sog.UUID); - RegionSyncMessage rsm = new RegionSyncMessage(RegionSyncMessage.MsgType.NewObject, sogxml); + //RegionSyncMessage rsm = new RegionSyncMessage(RegionSyncMessage.MsgType.NewObject, sogxml); + RegionSyncMessage rsm = new RegionSyncMessage(msgType, sogxml); Broadcast(rsm); } diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToScriptEngineSyncServer.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToScriptEngineSyncServer.cs index 4627038900..7c94e6ce0b 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToScriptEngineSyncServer.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToScriptEngineSyncServer.cs @@ -356,10 +356,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule { seConnector.SendObjectUpdate(msgType, sog); } - else - { - m_log.Warn(LogHeader + sog.AbsolutePosition.ToString() + " not covered by any script engine"); - } } //This is to send a message, rsm, to script engine, and the message is about object SOG. E.g. RemovedObject @@ -370,25 +366,29 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule { seConnector.Send(rsm); } - else - { - m_log.Warn(LogHeader + sog.AbsolutePosition.ToString() + " not covered by any script engine"); - } } private SceneToScriptEngineConnector GetSceneToSEConnector(SceneObjectGroup sog) { - if (sog==null) + if (m_scriptEngineConnectors.Count == 0) + return null; + if (sog == null) { return m_scriptEngineConnectors[0]; } - else + else { //Find the right SceneToSEConnector by the object's position //TO FINISH: Map the object to a quark first, then map the quark to SceneToSEConnector string quarkID = RegionSyncUtil.GetQuarkIDByPosition(sog.AbsolutePosition); SceneToScriptEngineConnector seConnector = m_quarksInScene[quarkID].SEConnector; + + if (seConnector == null) + { + m_log.Warn(LogHeader + sog.AbsolutePosition.ToString() + " not covered by any script engine"); + } + return seConnector; }