From 35fa85069e792579ebd44a974053d6dce288ea0a Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 28 Mar 2007 18:10:52 +0000
Subject: After hours of searching for a bug, it works - User accounts in
 sandbox mode, currently they are not persistent between restarts (ie
 restarting opensim.exe) but should be persistent between sessions (login/
 logout). Use the -account command line arg to enable them and then create new
 accounts through the web interface

---
 OpenSim.RegionServer/OpenSimMain.cs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'OpenSim.RegionServer/OpenSimMain.cs')

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index ed3e732..07a2d6d 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -75,6 +75,7 @@ namespace OpenSim
         public string m_physicsEngine;
         public bool m_sandbox = false;
         public bool m_loginserver;
+        public bool user_accounts = false;
 
         protected ConsoleBase m_console;
         
@@ -145,12 +146,22 @@ namespace OpenSim
 
             m_console.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server");
             HttpServer = new SimCAPSHTTPServer(GridServers.GridServer, Cfg.IPListenPort);
-            HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin", LocalWorld));
 
-            if ( m_loginserver && m_sandbox)
+            LoginServer loginServer = null;
+            if (m_loginserver && m_sandbox)
             {
-                LoginServer loginServer = new LoginServer(GridServers.GridServer, Cfg.IPListenAddr, Cfg.IPListenPort);
+                loginServer = new LoginServer(GridServers.GridServer, Cfg.IPListenAddr, Cfg.IPListenPort, this.user_accounts);
                 loginServer.Startup();
+                
+            }
+            if((m_loginserver) && (m_sandbox) && (user_accounts))
+            {
+                this.GridServers.UserServer = loginServer;
+                HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin", LocalWorld, loginServer));
+            }
+            else 
+            {
+                HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin", LocalWorld, null));
             }
 
             MainServerListener();
@@ -210,6 +221,11 @@ namespace OpenSim
                 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;
                 this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
                 SimClient newuser = new SimClient(epSender, useCircuit, LocalWorld, ClientThreads, AssetCache, GridServers.GridServer, this, InventoryCache, m_sandbox);
+                if ((this.GridServers.UserServer != null) && (user_accounts))
+                {
+                    Console.WriteLine("setting userserver");
+                    newuser.UserServer = this.GridServers.UserServer;
+                }
                 //OpenSimRoot.Instance.ClientThreads.Add(epSender, newuser);
                 ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
             }
-- 
cgit v1.1