Added a new column (SceneGroupID) to sqlite3 table (sqlite3-prims.sql) so that we can tell what prims belong to the same SceneObjectGroup. If sdague has a different method in mind when he gets back then he can change it then.

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
 
             base.StartUp();
 
-            if (!m_sandbox)
-            {
-                m_httpServer.AddStreamHandler(new SimStatusHandler());
-            }
-
             if (m_sandbox)
             {
                 CommunicationsLocal localComms  = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, standaloneAuthenticate);
                 m_commsManager = localComms;
                 if(standaloneAuthenticate)
                 {
-                    this.CreateAccount = localComms.do_create;
+                    this.CreateAccount = localComms.doCreate;
                 }
             }
             else
             {
                 m_commsManager = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache);
+                m_httpServer.AddStreamHandler(new SimStatusHandler());
             }
 
             string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
@@ -326,11 +322,6 @@ namespace OpenSim
                     }
                     break;
 
-                case "quit":
-                case "shutdown":
-                    Shutdown();
-                    break;
-
                 case "create":
                     if (CreateAccount != null)
                     {
@@ -338,6 +329,11 @@ namespace OpenSim
                     }
                     break;
 
+                case "quit":
+                case "shutdown":
+                    Shutdown();
+                    break;
+
                 default:
                     m_log.Error("Unknown command");
                     break;