aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs18
1 files changed, 7 insertions, 11 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 611041d..6c49817 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -121,23 +121,19 @@ namespace OpenSim
121 121
122 base.StartUp(); 122 base.StartUp();
123 123
124 if (!m_sandbox)
125 {
126 m_httpServer.AddStreamHandler(new SimStatusHandler());
127 }
128
129 if (m_sandbox) 124 if (m_sandbox)
130 { 125 {
131 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, standaloneAuthenticate); 126 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, standaloneAuthenticate);
132 m_commsManager = localComms; 127 m_commsManager = localComms;
133 if(standaloneAuthenticate) 128 if(standaloneAuthenticate)
134 { 129 {
135 this.CreateAccount = localComms.do_create; 130 this.CreateAccount = localComms.doCreate;
136 } 131 }
137 } 132 }
138 else 133 else
139 { 134 {
140 m_commsManager = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache); 135 m_commsManager = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache);
136 m_httpServer.AddStreamHandler(new SimStatusHandler());
141 } 137 }
142 138
143 string regionConfigPath = Path.Combine(Util.configDir(), "Regions"); 139 string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
@@ -326,11 +322,6 @@ namespace OpenSim
326 } 322 }
327 break; 323 break;
328 324
329 case "quit":
330 case "shutdown":
331 Shutdown();
332 break;
333
334 case "create": 325 case "create":
335 if (CreateAccount != null) 326 if (CreateAccount != null)
336 { 327 {
@@ -338,6 +329,11 @@ namespace OpenSim
338 } 329 }
339 break; 330 break;
340 331
332 case "quit":
333 case "shutdown":
334 Shutdown();
335 break;
336
341 default: 337 default:
342 m_log.Error("Unknown command"); 338 m_log.Error("Unknown command");
343 break; 339 break;