From 56e6587c9f3ff9b8b9e48ff20a21244b739e2081 Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 3 Apr 2007 13:37:11 +0000
Subject: Temporary fix for the object taking bug

---
 OpenSim.RegionServer/OpenSimMain.cs | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

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

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 8bbdcd5..316bcd9 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -108,7 +108,7 @@ namespace OpenSim
             {
                 Console.WriteLine(e.Message);
             }
-
+            m_console.WriteLine("Main.cs:Startup() - Loading configuration");
             string configfromgrid = localConfig.GetAttribute("ConfigFromGrid");
             if (configfromgrid == "true")
             {
@@ -122,6 +122,7 @@ namespace OpenSim
             {
                 this.regionData.InitConfig(this.m_sandbox, this.localConfig);
             }
+            this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
 
             GridServers = new Grid();
             if (m_sandbox)
@@ -146,11 +147,6 @@ namespace OpenSim
             AssetCache = new AssetCache(GridServers.AssetServer);
             InventoryCache = new InventoryCache();
 
-            // We check our local database first, then the grid for config options
-            m_console.WriteLine("Main.cs:Startup() - Loading configuration");
-            //Cfg = this.LoadConfigDll(this.ConfigDll);
-            //Cfg.InitConfig(this.m_sandbox);
-
             PacketServer packetServer = new PacketServer(this);
 
             m_console.WriteLine("Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
@@ -207,11 +203,11 @@ namespace OpenSim
 
                         return new XmlRpcResponse();
                     });
-		_httpServer.AddRestHandler("GET","/simstatus/",
-		    delegate(string request, string path)
-		    {
-			return "OK";
-		    });
+                _httpServer.AddRestHandler("GET", "/simstatus/",
+                    delegate(string request, string path)
+                    {
+                        return "OK";
+                    });
             }
 
             LoginServer loginServer = null;
@@ -222,14 +218,14 @@ namespace OpenSim
             {
                 loginServer = new LoginServer(gridServer, regionData.IPListenAddr, regionData.IPListenPort, this.user_accounts);
                 loginServer.Startup();
-                
-                if( user_accounts )
+
+                if (user_accounts)
                 {
                     //sandbox mode with loginserver using accounts
                     this.GridServers.UserServer = loginServer;
                     adminLoginServer = loginServer;
-                    
-                    _httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.LocalUserManager.XmlRpcLoginMethod);                    
+
+                    _httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.LocalUserManager.XmlRpcLoginMethod);
                 }
                 else
                 {
@@ -239,8 +235,8 @@ namespace OpenSim
             }
 
             AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer);
-            adminWebFront.LoadMethods( _httpServer );
-            
+            adminWebFront.LoadMethods(_httpServer);
+
             m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");
             _httpServer.Start();
 
-- 
cgit v1.1