From f4bf581b96347b8d7f115eca74fa84a644eb729c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 26 Sep 2009 21:00:51 -0700
Subject: Moved all HG1 operations to HGGridConnector.cs and
 HypergridServerConnector.cs/HypergridServiceConnector.cs, away from
 Region.Communications and HGNetworkServersInfo. Fixed small bugs with
 hyperlinked regions' map positions.

---
 .../ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs    | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 6a66116..18641f1 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -144,7 +144,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
                 // We are in grid mode
                 InitialiseHGGridServices(libraryRootFolder);
             }
-            HGCommands.HGServices = HGServices;
         }
 
         protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder)
-- 
cgit v1.1


From 989382352dc5b5b75876607f6fc2f1f753f0fd15 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 26 Sep 2009 21:14:41 -0700
Subject: Poof! on Region.Communications.Hypergrid. Grid code deleted.

---
 .../CreateCommsManager/CreateCommsManagerPlugin.cs               | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 18641f1..cd93bea 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -187,18 +187,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
         protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
         {    
-            HGGridServicesStandalone gridService 
-                = new HGGridServicesStandalone(
-                    m_openSim.NetServersInfo, m_httpServer, m_openSim.SceneManager);                         
-
             m_commsManager 
                 = new HGCommunicationsStandalone(
                     m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, 
-                    gridService, 
                     libraryRootFolder, false);                        
             
-            HGServices = gridService;
-
             CreateGridInfoService();
         }
 
@@ -209,8 +202,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
                     m_openSim.NetServersInfo,
                     m_openSim.SceneManager, libraryRootFolder);
 
-            HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices;
-
             m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
             m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
             if (m_openSim.userStatsURI != String.Empty)
-- 
cgit v1.1


From 0f05bbb4a20224492febf17604fa23ef2486fa1a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 28 Sep 2009 05:54:37 -0700
Subject: Deleted some files that aren't being used anymore.

---
 .../ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs    | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index cd93bea..20cec04 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -69,7 +69,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
         protected CommunicationsManager m_commsManager;
         protected GridInfoService m_gridInfoService;
-        protected IHyperlink HGServices = null;
 
         protected IRegionCreator m_regionCreator;
 
-- 
cgit v1.1


From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 1 Oct 2009 01:00:09 +0900
Subject: Formatting cleanup.

---
 .../ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 20cec04..0f827b0 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -185,11 +185,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         }
 
         protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
-        {    
+        {
             m_commsManager 
                 = new HGCommunicationsStandalone(
                     m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, 
-                    libraryRootFolder, false);                        
+                    libraryRootFolder, false);
             
             CreateGridInfoService();
         }
-- 
cgit v1.1