1 files changed, 113 insertions, 102 deletions
diff --git a/OpenSim/SimulatorServices/RegionInventoryService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/RegionInventoryService.cs
index d95058e..129b40c 100644
--- a/OpenSim/SimulatorServices/RegionInventoryService.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/RegionInventoryService.cs
@@ -1,102 +1,113 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
+ *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Reflection;
+using System.Reflection;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Server.Base;
+using OpenSim.Server.Base;
-using OpenSim.Server.Handlers.Base;
+using OpenSim.Server.Handlers.Base;
-namespace OpenSim.SimulatorServices
+namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
-{
+{
-    public class RegionInventoryService : ISharedRegionModule
+    public class RegionInventoryService : ISharedRegionModule
-    {
+    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private static bool enabled = false;
+        private static bool m_Enabled = false;
-        
+        
-        private IConfigSource m_Config;
+        private IConfigSource m_Config;
-        bool m_Registered = false;
+        bool m_Registered = false;
-        #region IRegionModule interface
+        #region IRegionModule interface
-        public void Initialise(IConfigSource config)
+        public void Initialise(IConfigSource config)
-        {
+        {
-            // This module is only on for standalones in hypergrid mode
+            //// This module is only on for standalones in hypergrid mode
-            enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
+            //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
-                config.Configs["Startup"].GetBoolean("hypergrid", true);
+            //    config.Configs["Startup"].GetBoolean("hypergrid", true);
-            m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);
+            //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);
-            m_Config = config;
+            m_Config = config;
-        }
+            IConfig moduleConfig = config.Configs["Modules"];
+            if (moduleConfig != null)
-        public void PostInitialise()
+            {
-        {
+                m_Enabled = moduleConfig.GetBoolean("InventoryServiceInConnector", false);
-        }
+                if (m_Enabled)
+                {
-        public void Close()
+                    m_log.Info("[INVENTORY IN CONNECTOR]: Inventory Service In Connector enabled");
-        {
+                }
-        }
+            }
-        public string Name
-        {
+        }
-            get { return "RegionInventoryService"; }
-        }
+        public void PostInitialise()
+        {
-        public void AddRegion(Scene scene)
+        }
-        {
-            if (!enabled)
+        public void Close()
-                return;
+        {
+        }
-            if (!m_Registered)
-            {
+        public string Name
-                m_Registered = true;
+        {
+            get { return "RegionInventoryService"; }
-                m_log.Info("[RegionInventoryService]: Starting...");
+        }
-                Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
+        public void AddRegion(Scene scene)
+        {
-                ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args);
+            if (!m_Enabled)
-            }
+                return;
-        }
+            if (!m_Registered)
-        public void RemoveRegion(Scene scene)
+            {
-        {
+                m_Registered = true;
-        }
+                m_log.Info("[RegionInventoryService]: Starting...");
-        public void RegionLoaded(Scene scene)
-        {
+                Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
-        }
+                ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args);
-        #endregion
+            }
+        }
-    }
-}
+        public void RemoveRegion(Scene scene)
+        {
+        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        #endregion
+    }
+}

diff --git a/OpenSim/SimulatorServices/RegionInventoryService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/RegionInventoryService.cs index d95058e..129b40c 100644 --- a/OpenSim/SimulatorServices/RegionInventoryService.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/RegionInventoryService.cs
@@ -1,102 +1,113 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSimulator Project nor the	12	* * Neither the name of the OpenSimulator Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	using System;	28	using System;
29	using System.Reflection;	29	using System.Reflection;
30	using System.Collections.Generic;	30	using System.Collections.Generic;
31	using log4net;	31	using log4net;
32	using Nini.Config;	32	using Nini.Config;
33	using OpenSim.Framework;	33	using OpenSim.Framework;
34	using OpenSim.Framework.Servers.HttpServer;	34	using OpenSim.Framework.Servers.HttpServer;
35	using OpenSim.Region.Framework.Scenes;	35	using OpenSim.Region.Framework.Scenes;
36	using OpenSim.Region.Framework.Interfaces;	36	using OpenSim.Region.Framework.Interfaces;
37	using OpenSim.Server.Base;	37	using OpenSim.Server.Base;
38	using OpenSim.Server.Handlers.Base;	38	using OpenSim.Server.Handlers.Base;
39		39
40	namespace OpenSim.SimulatorServices	40	namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
41	{	41	{
42	public class RegionInventoryService : ISharedRegionModule	42	public class RegionInventoryService : ISharedRegionModule
43	{	43	{
44	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	44	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45	private static bool enabled = false;	45	private static bool m_Enabled = false;
46		46
47	private IConfigSource m_Config;	47	private IConfigSource m_Config;
48	bool m_Registered = false;	48	bool m_Registered = false;
49		49
50	#region IRegionModule interface	50	#region IRegionModule interface
51		51
52	public void Initialise(IConfigSource config)	52	public void Initialise(IConfigSource config)
53	{	53	{
54	// This module is only on for standalones in hypergrid mode	54	//// This module is only on for standalones in hypergrid mode
55	enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&	55	//enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
56	config.Configs["Startup"].GetBoolean("hypergrid", true);	56	// config.Configs["Startup"].GetBoolean("hypergrid", true);
57	m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);	57	//m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);
58	m_Config = config;	58	m_Config = config;
59	}	59	IConfig moduleConfig = config.Configs["Modules"];
60		60	if (moduleConfig != null)
61	public void PostInitialise()	61	{
62	{	62	m_Enabled = moduleConfig.GetBoolean("InventoryServiceInConnector", false);
63	}	63	if (m_Enabled)
64		64	{
65	public void Close()	65	m_log.Info("[INVENTORY IN CONNECTOR]: Inventory Service In Connector enabled");
66	{	66	}
67	}	67
68		68	}
69	public string Name	69
70	{	70	}
71	get { return "RegionInventoryService"; }	71
72	}	72	public void PostInitialise()
73		73	{
74	public void AddRegion(Scene scene)	74	}
75	{	75
76	if (!enabled)	76	public void Close()
77	return;	77	{
78		78	}
79	if (!m_Registered)	79
80	{	80	public string Name
81	m_Registered = true;	81	{
82		82	get { return "RegionInventoryService"; }
83	m_log.Info("[RegionInventoryService]: Starting...");	83	}
84		84
85	Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };	85	public void AddRegion(Scene scene)
86		86	{
87	ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args);	87	if (!m_Enabled)
88	}	88	return;
89	}	89
90		90	if (!m_Registered)
91	public void RemoveRegion(Scene scene)	91	{
92	{	92	m_Registered = true;
93	}	93
94		94	m_log.Info("[RegionInventoryService]: Starting...");
95	public void RegionLoaded(Scene scene)	95
96	{	96	Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
97	}	97
98		98	ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args);
99	#endregion	99	}
100		100	}
101	}	101
102	}	102	public void RemoveRegion(Scene scene)
		103	{
		104	}
		105
		106	public void RegionLoaded(Scene scene)
		107	{
		108	}
		109
		110	#endregion
		111
		112	}
		113	}