Factoring out "land_data" / RequestLandData that was hanging off of IGridServices, erroneously. Not sure when this is used, but now it is implemented in the new model of service connectors. Hopefully it works.

2 files changed, 138 insertions, 0 deletions

diff --git a/OpenSim/SimulatorServices/LandServiceInConnectorModule.cs b/OpenSim/SimulatorServices/LandServiceInConnectorModule.cs
new file mode 100644
index 0000000..58d276d
--- /dev/null
+++ b/OpenSim/SimulatorServices/LandServiceInConnectorModule.cs
@@ -0,0 +1,137 @@
+/*

+ * 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 OpenSimulator 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.Reflection;

+using System.Collections.Generic;

+using log4net;

+using Nini.Config;

+using OpenSim.Framework;

+using OpenSim.Framework.Servers.HttpServer;

+using OpenSim.Region.Framework.Scenes;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Server.Base;

+using OpenSim.Server.Handlers.Base;

+using OpenSim.Services.Interfaces;

+

+

+namespace OpenSim.SimulatorServices

+{

+    public class LandServiceInConnectorModule : ISharedRegionModule, ILandService

+    {

+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

+        private static bool m_Enabled = false;

+        private static bool m_Registered = false;

+

+        private IConfigSource m_Config;

+        private List<Scene> m_Scenes = new List<Scene>();

+

+        #region IRegionModule interface

+

+        public void Initialise(IConfigSource config)

+        {

+            m_Config = config;

+

+            IConfig moduleConfig = config.Configs["Modules"];

+            if (moduleConfig != null)

+            {

+                m_Enabled = moduleConfig.GetBoolean("LandServiceInConnector", false);

+                if (m_Enabled)

+                {

+                    m_log.Info("[LAND IN CONNECTOR]: LandServiceInConnector enabled");

+                }

+

+            }

+

+        }

+

+        public void PostInitialise()

+        {

+            if (!m_Enabled)

+                return;

+

+            m_log.Info("[LAND IN CONNECTOR]: Starting...");

+        }

+

+        public void Close()

+        {

+        }

+

+        public string Name

+        {

+            get { return "LandServiceInConnectorModule"; }

+        }

+

+        public void AddRegion(Scene scene)

+        {

+            if (!m_Enabled)

+                return;

+

+            if (!m_Registered)

+            {

+                m_Registered = true;

+                Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene };

+                ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:LandServiceInConnector", args);

+            }

+

+            m_Scenes.Add(scene);

+

+        }

+

+        public void RemoveRegion(Scene scene)

+        {

+            if (m_Enabled && m_Scenes.Contains(scene))

+                m_Scenes.Remove(scene);

+        }

+

+        public void RegionLoaded(Scene scene)

+        {

+        }

+

+        #endregion

+

+        #region ILandService

+

+        public LandData GetLandData(ulong regionHandle, uint x, uint y)

+        {

+            m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {2}",

+                regionHandle, m_Scenes.Count);

+            foreach (Scene s in m_Scenes)

+            {

+                if (s.RegionInfo.RegionHandle == regionHandle)

+                {

+                    m_log.Debug("[LAND IN CONNECTOR]: Found region to GetLandData from");

+                    return s.GetLandData(x, y);

+                }

+            }

+            m_log.DebugFormat("[LAND IN CONNECTOR]: region handle {0} not found", regionHandle);

+            return null;

+        }

+

+        #endregion ILandService

+    }

+}

diff --git a/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml b/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml
index c83af7b..18b9423 100644
--- a/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml
+++ b/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml
@@ -11,6 +11,7 @@
         <RegionModule id="RegionAssetService" type="OpenSim.SimulatorServices.RegionAssetService" />
         <RegionModule id="RegionInventoryService" type="OpenSim.SimulatorServices.RegionInventoryService" />
         <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.SimulatorServices.NeighbourServiceInConnectorModule" />
+        <RegionModule id="LandServiceInConnectorModule" type="OpenSim.SimulatorServices.LandServiceInConnectorModule" />
     </Extension>
 
 </Addin>