From a84456c2391e9fa7c5ade8244bf979118a3d0e29 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Thu, 29 May 2008 13:55:02 +0000 Subject: Mantis#1411. Thank you kindly for Dataserver.cs and a patch that adds function stub to request region info by name and adds llRequestSimulatorData() and the dataserver event --- .../Region/Communications/OGS1/OGS1GridServices.cs | 8 +- OpenSim/Region/Environment/Scenes/Scene.cs | 5 + .../Scenes/SceneCommunicationService.cs | 5 + .../Common/BuiltIn_Commands_BaseClass.cs | 4 +- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 48 +++++++- .../Common/LSL_BuiltIn_Commands_Interface.cs | 2 +- .../Common/ScriptEngineBase/AsyncCommandManager.cs | 7 ++ .../AsyncCommandPlugins/Dataserver.cs | 126 +++++++++++++++++++++ 8 files changed, 198 insertions(+), 7 deletions(-) create mode 100644 OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 5e7e238..cf0e0e8 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -397,7 +397,10 @@ namespace OpenSim.Region.Communications.OGS1 public RegionInfo RequestClosestRegion(string regionName) { - // Don't use this method. It's only for SLURLS and Logins + foreach (RegionInfo ri in m_remoteRegionInfoCache.Values) + if(ri.RegionName == regionName) + return ri; + RegionInfo regionInfo = null; try { @@ -438,7 +441,8 @@ namespace OpenSim.Region.Communications.OGS1 regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]); regionInfo.RegionName = (string) responseData["region_name"]; - m_remoteRegionInfoCache.Add(regionInfo.RegionHandle, regionInfo); + if(!m_remoteRegionInfoCache.ContainsKey(regionInfo.RegionHandle)) + m_remoteRegionInfoCache.Add(regionInfo.RegionHandle, regionInfo); } catch (WebException) { diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1be0617..2b667c9 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -2912,6 +2912,11 @@ namespace OpenSim.Region.Environment.Scenes } } + public RegionInfo RequestClosestRegion(string name) + { + return m_sceneGridService.RequestClosestRegion(name); + } + #endregion #region Script Engine diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 885d1e9..d2d75e8 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -112,6 +112,11 @@ namespace OpenSim.Region.Environment.Scenes } } + public RegionInfo RequestClosestRegion(string name) + { + return m_commsProvider.GridService.RequestClosestRegion(name); + } + public void Close() { if (regionCommsHost != null) diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index 7b9b496..c273c03 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs @@ -1678,9 +1678,9 @@ namespace OpenSim.Region.ScriptEngine.Common return m_LSL_Functions.llGetInventoryCreator(item); } - public void llRequestSimulatorData(string simulator, int data) + public string llRequestSimulatorData(string simulator, int data) { - m_LSL_Functions.llRequestSimulatorData(simulator, data); + return m_LSL_Functions.llRequestSimulatorData(simulator, data); } public void llForceMouselook(int mouselook) diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 4e25ff8..9a2d240 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -5618,10 +5618,54 @@ namespace OpenSim.Region.ScriptEngine.Common wComm.DeliverMessage(ChatTypeEnum.Owner, 0, m_host.Name, m_host.UUID, msg); } - public void llRequestSimulatorData(string simulator, int data) + public string llRequestSimulatorData(string simulator, int data) { m_host.AddScriptLPS(1); - NotImplemented("llRequestSimulatorData"); + + string reply = String.Empty; + + RegionInfo info = m_ScriptEngine.World.RequestClosestRegion(simulator); + + switch(data) + { + case 5: // DATA_SIM_POS + if(info == null) + return LLUUID.Zero.ToString(); + reply = new LSL_Types.Vector3( + info.RegionLocX * Constants.RegionSize, + info.RegionLocY * Constants.RegionSize, + 0).ToString(); + break; + case 6: // DATA_SIM_STATUS + if(info != null) + reply = "up"; // Duh! + else + reply = "unknown"; + break; + case 7: // DATA_SIM_RATING + if(info == null) + return LLUUID.Zero.ToString(); + int access = (int)info.EstateSettings.simAccess; + if(access == 21) + reply = "MATURE"; + else if(access == 13) + reply = "MATURE"; + else + reply = "UNKNOWN"; + break; + default: + return LLUUID.Zero.ToString(); // Raise no event + } + LLUUID rq = LLUUID.Random(); + + LLUUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager. + m_Dataserver.RegisterRequest(m_localID, + m_itemID, rq.ToString()); + + m_ScriptEngine.m_ASYNCLSLCommandManager. + m_Dataserver.DataserverReply(rq.ToString(), reply); + + return tid.ToString(); } public void llForceMouselook(int mouselook) diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs index dae7fa0..c6464f3 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs @@ -576,7 +576,7 @@ namespace OpenSim.Region.ScriptEngine.Common //wiki: llOwnerSay(string msg) void llOwnerSay(string msg); //wiki: key llRequestSimulatorData(string simulator, integer data) - void llRequestSimulatorData(string simulator, int data); + string llRequestSimulatorData(string simulator, int data); //wiki: llForceMouselook(integer mouselook) void llForceMouselook(int mouselook); //wiki: double llGetObjectMass(key id) diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs index 2a0ed37..64f6970 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs @@ -50,6 +50,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase public Listener m_Listener; public SensorRepeat m_SensorRepeat; public XmlRequest m_XmlRequest; + public Dataserver m_Dataserver; public AsyncCommandManager(ScriptEngine _ScriptEngine) { @@ -62,6 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase m_Listener = new Listener(this); m_SensorRepeat = new SensorRepeat(this); m_XmlRequest = new XmlRequest(this); + m_Dataserver = new Dataserver(this); StartThread(); } @@ -142,6 +144,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase m_Listener.CheckListeners(); // Check Sensors m_SensorRepeat.CheckSenseRepeaterEvents(); + // Check dataserver + m_Dataserver.ExpireRequests(); } /// @@ -171,6 +175,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // Remove Sensors m_SensorRepeat.UnSetSenseRepeaterEvents(localID, itemID); + // Remove queries + m_Dataserver.RemoveEvents(localID, itemID); + } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs new file mode 100644 index 0000000..eb87a9c --- /dev/null +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs @@ -0,0 +1,126 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using libsecondlife; + +namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins + +{ + public class Dataserver + { + public AsyncCommandManager m_CmdManager; + + private Dictionary DataserverRequests = + new Dictionary(); + + public Dataserver(AsyncCommandManager CmdManager) + { + m_CmdManager = CmdManager; + } + + private class DataserverRequest + { + public uint localID; + public LLUUID itemID; + + public LLUUID ID; + public string handle; + + public DateTime startTime; + } + + public LLUUID RegisterRequest(uint localID, LLUUID itemID, + string identifier) + { + lock(DataserverRequests) + { + if(DataserverRequests.ContainsKey(identifier)) + return LLUUID.Zero; + + DataserverRequest ds = new DataserverRequest(); + + ds.localID = localID; + ds.itemID = itemID; + + ds.ID = LLUUID.Random(); + ds.handle = identifier; + + ds.startTime = DateTime.Now; + + DataserverRequests[identifier]=ds; + + return ds.ID; + } + } + + public void DataserverReply(string identifier, string reply) + { + DataserverRequest ds; + + lock(DataserverRequests) + { + if(!DataserverRequests.ContainsKey(identifier)) + return; + + ds=DataserverRequests[identifier]; + DataserverRequests.Remove(identifier); + } + + m_CmdManager.m_ScriptEngine.m_EventQueueManager.AddToObjectQueue( + ds.localID, "dataserver", EventQueueManager.llDetectNull, + new Object[] { new LSL_Types.LSLString(ds.ID.ToString()), + new LSL_Types.LSLString(reply)}); + } + + public void RemoveEvents(uint localID, LLUUID itemID) + { + lock(DataserverRequests) + { + foreach (DataserverRequest ds in new List(DataserverRequests.Values)) + { + if(ds.itemID == itemID) + DataserverRequests.Remove(ds.handle); + } + } + } + + public void ExpireRequests() + { + lock(DataserverRequests) + { + foreach (DataserverRequest ds in new List(DataserverRequests.Values)) + { + if(ds.startTime > DateTime.Now.AddSeconds(30)) + DataserverRequests.Remove(ds.handle); + } + } + } + } +} -- cgit v1.1