aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authordiva2009-04-27 00:16:59 +0000
committerdiva2009-04-27 00:16:59 +0000
commitd8313e314feddc492ec9d8e657aa7d0a15a7004b (patch)
tree4024a8bebbc83745b1df22981b001559346bc247 /OpenSim/ApplicationPlugins
parentHGWorldMap got a bit out of sync during the introduction of the new module sy... (diff)
downloadopensim-SC_OLD-d8313e314feddc492ec9d8e657aa7d0a15a7004b.zip
opensim-SC_OLD-d8313e314feddc492ec9d8e657aa7d0a15a7004b.tar.gz
opensim-SC_OLD-d8313e314feddc492ec9d8e657aa7d0a15a7004b.tar.bz2
opensim-SC_OLD-d8313e314feddc492ec9d8e657aa7d0a15a7004b.tar.xz
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.
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs16
1 files changed, 1 insertions, 15 deletions
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
130 130
131 protected void InitialiseHGServices(OpenSimBase openSim, LibraryRootFolder libraryRootFolder) 131 protected void InitialiseHGServices(OpenSimBase openSim, LibraryRootFolder libraryRootFolder)
132 { 132 {
133 HGOpenSimNode hgNode = null;
134 try
135 {
136 hgNode = (HGOpenSimNode) openSim;
137 }
138 catch (Exception e)
139 {
140 m_log.Error("[CreateComms] " + e.Message);
141 m_log.Error("[CreateComms] The OpenSim application class was : " + openSim.ToString());
142 m_log.Error("[CreateComms] To use hypergrid mode, please make sure you are starting opensim with the command line: opensim.exe -hypergrid=true");
143 m_log.Error("[CreateComms] Also hypergrid mode can not be ran while using the -background=true command line argument.");
144 Environment.Exit(1);
145 }
146
147 // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) 133 // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
148 if (m_openSim.ConfigurationSettings.Standalone) 134 if (m_openSim.ConfigurationSettings.Standalone)
149 { 135 {
@@ -154,7 +140,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
154 // We are in grid mode 140 // We are in grid mode
155 InitialiseHGGridServices(libraryRootFolder); 141 InitialiseHGGridServices(libraryRootFolder);
156 } 142 }
157 hgNode.HGServices = HGServices; 143 HGCommands.HGServices = HGServices;
158 } 144 }
159 145
160 protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder) 146 protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder)