Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-08-18 00:59:20 +0100
committer: Melanie 2010-08-18 00:59:20 +0100
commit: e74809ff4c7fd67ceb5336e5d8e7811591f6cce3 (patch)
tree: 3e878fb80be75106631d76a12b8da9e65e98f7b9 /OpenSim/Region/CoreModules/ServiceConnectorsOut
parent: Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent: * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() t... (diff)
download: opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.zip
opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.gz
opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.bz2
opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.xz
2 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index aa3b30d..153aeec 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -32,7 +32,6 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Statistics;
 using OpenSim.Services.Connectors;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -48,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        private bool m_Enabled = false;
        private bool m_Initialized = false;
-        private Scene m_Scene;
+//        private Scene m_Scene;
        private InventoryServicesConnector m_RemoteConnector;
        public Type ReplaceableInterface 
@@ -105,7 +104,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        public void AddRegion(Scene scene)
        {
-            m_Scene = scene;
+//            m_Scene = scene;
            //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
            if (!m_Enabled)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 277060d..ada26cc 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -32,7 +32,6 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Statistics;
 using OpenSim.Services.Connectors;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -48,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        private bool m_Enabled = false;
        private bool m_Initialized = false;
-        private Scene m_Scene;
+//        private Scene m_Scene;
        private XInventoryServicesConnector m_RemoteConnector;
        public Type ReplaceableInterface 
@@ -109,7 +108,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        public void AddRegion(Scene scene)
        {
-            m_Scene = scene;
+//            m_Scene = scene;
            //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
            if (!m_Enabled)
author	Melanie	2010-08-18 00:59:20 +0100
committer	Melanie	2010-08-18 00:59:20 +0100
commit	e74809ff4c7fd67ceb5336e5d8e7811591f6cce3 (patch)
tree	3e878fb80be75106631d76a12b8da9e65e98f7b9 /OpenSim/Region/CoreModules/ServiceConnectorsOut
parent	Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent	* Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() t... (diff)
download	opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.zip opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.gz opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.bz2 opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.xz

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index aa3b30d..153aeec 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -32,7 +32,6 @@ using System.Reflection;
32	using Nini.Config;	32	using Nini.Config;
33	using OpenSim.Framework;	33	using OpenSim.Framework;
34	using OpenSim.Framework.Statistics;	34	using OpenSim.Framework.Statistics;
35
36	using OpenSim.Services.Connectors;	35	using OpenSim.Services.Connectors;
37	using OpenSim.Region.Framework.Interfaces;	36	using OpenSim.Region.Framework.Interfaces;
38	using OpenSim.Region.Framework.Scenes;	37	using OpenSim.Region.Framework.Scenes;
@@ -48,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
48		47
49	private bool m_Enabled = false;	48	private bool m_Enabled = false;
50	private bool m_Initialized = false;	49	private bool m_Initialized = false;
51	private Scene m_Scene;	50	// private Scene m_Scene;
52	private InventoryServicesConnector m_RemoteConnector;	51	private InventoryServicesConnector m_RemoteConnector;
53		52
54	public Type ReplaceableInterface	53	public Type ReplaceableInterface
@@ -105,7 +104,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
105		104
106	public void AddRegion(Scene scene)	105	public void AddRegion(Scene scene)
107	{	106	{
108	m_Scene = scene;	107	// m_Scene = scene;
109	//m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);	108	//m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
110		109
111	if (!m_Enabled)	110	if (!m_Enabled)


diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 277060d..ada26cc 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -32,7 +32,6 @@ using System.Reflection;
32	using Nini.Config;	32	using Nini.Config;
33	using OpenSim.Framework;	33	using OpenSim.Framework;
34	using OpenSim.Framework.Statistics;	34	using OpenSim.Framework.Statistics;
35
36	using OpenSim.Services.Connectors;	35	using OpenSim.Services.Connectors;
37	using OpenSim.Region.Framework.Interfaces;	36	using OpenSim.Region.Framework.Interfaces;
38	using OpenSim.Region.Framework.Scenes;	37	using OpenSim.Region.Framework.Scenes;
@@ -48,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
48		47
49	private bool m_Enabled = false;	48	private bool m_Enabled = false;
50	private bool m_Initialized = false;	49	private bool m_Initialized = false;
51	private Scene m_Scene;	50	// private Scene m_Scene;
52	private XInventoryServicesConnector m_RemoteConnector;	51	private XInventoryServicesConnector m_RemoteConnector;
53		52
54	public Type ReplaceableInterface	53	public Type ReplaceableInterface
@@ -109,7 +108,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
109		108
110	public void AddRegion(Scene scene)	109	public void AddRegion(Scene scene)
111	{	110	{
112	m_Scene = scene;	111	// m_Scene = scene;
113	//m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);	112	//m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
114		113
115	if (!m_Enabled)	114	if (!m_Enabled)