From d8313e314feddc492ec9d8e657aa7d0a15a7004b Mon Sep 17 00:00:00 2001
From: diva
Date: Mon, 27 Apr 2009 00:16:59 +0000
Subject: Getting rid of -hypergrid=true on the command line. This config now
 goes inside OpenSim.ini in the Startup section. This makes the HG compatible
 with -background, and prepares the way for further work on HG-related config
 vars. Might help with mantis #3527.

---
 .../CreateCommsManager/CreateCommsManagerPlugin.cs       | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 3b98038..2bf5133 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -130,20 +130,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
         protected void InitialiseHGServices(OpenSimBase openSim, LibraryRootFolder libraryRootFolder)
         {
-            HGOpenSimNode hgNode = null;
-            try
-            {
-                hgNode = (HGOpenSimNode) openSim;
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[CreateComms] " + e.Message);
-                m_log.Error("[CreateComms] The OpenSim application class was : " + openSim.ToString());
-                m_log.Error("[CreateComms] To use hypergrid mode, please make sure you are starting opensim with the command line: opensim.exe -hypergrid=true");
-                m_log.Error("[CreateComms] Also hypergrid mode can not be ran while using the -background=true command line argument.");
-                Environment.Exit(1);
-            }
-
             // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
             if (m_openSim.ConfigurationSettings.Standalone)
             {
@@ -154,7 +140,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
                 // We are in grid mode
                 InitialiseHGGridServices(libraryRootFolder);
             }
-            hgNode.HGServices = HGServices;
+            HGCommands.HGServices = HGServices;
         }
 
         protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder)
-- 
cgit v1.1