Heart surgery no.2: the inventory service hooks.

Several improvements in the connectors themselves.
Several improvements in configurations.
Needed to add a hack in IUserService and UserManagerBase, to be removed when that service is refactored.

2 files changed, 103 insertions, 0 deletions

diff --git a/OpenSim/SimulatorServices/RegionInventoryService.cs b/OpenSim/SimulatorServices/RegionInventoryService.cs
new file mode 100644
index 0000000..8422a92
--- /dev/null
+++ b/OpenSim/SimulatorServices/RegionInventoryService.cs
@@ -0,0 +1,102 @@
+/*

+ * 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;

+

+namespace OpenSim.SimulatorServices

+{

+    public class RegionInventoryService : ISharedRegionModule

+    {

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

+        private static bool enabled = false;

+        

+        private IConfigSource m_Config;

+        bool m_Registered = false;

+

+        #region IRegionModule interface

+

+        public void Initialise(IConfigSource config)

+        {

+            // This module is only on for standalones in hypergrid mode

+            enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&

+                config.Configs["Startup"].GetBoolean("hypergrid", true);

+            m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);

+            m_Config = config;

+        }

+

+        public void PostInitialise()

+        {

+        }

+

+        public void Close()

+        {

+        }

+

+        public string Name

+        {

+            get { return "RegionInventoryService"; }

+        }

+

+        public void AddRegion(Scene scene)

+        {

+            if (!enabled)

+                return;

+

+            if (!m_Registered)

+            {

+                m_Registered = true;

+

+                m_log.Info("[RegionInventoryService]: Starting...");

+

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

+

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

+            }

+        }

+

+        public void RemoveRegion(Scene scene)

+        {

+        }

+

+        public void RegionLoaded(Scene scene)

+        {

+        }

+

+        #endregion

+

+    }

+}

diff --git a/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml b/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml
index 05f143d..77d7d70 100644
--- a/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml
+++ b/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml
@@ -9,6 +9,7 @@
 
     <Extension path = "/OpenSim/RegionModules">
         <RegionModule id="RegionAssetService" type="OpenSim.SimulatorServices.RegionAssetService" />
+      <RegionModule id="RegionInventoryService" type="OpenSim.SimulatorServices.RegionInventoryService" />
     </Extension>
 
 </Addin>