From f741e00ad8b87485d98e8bca82e4256cb30615d1 Mon Sep 17 00:00:00 2001
From: gareth
Date: Wed, 4 Apr 2007 18:57:13 +0000
Subject: Added SimUUID Added empty POST for /sims in REST on gridserver

---
 OpenSim.RegionServer/OpenSimMain.cs | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

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

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 5db654e..a3dfa6d 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -55,6 +55,7 @@ namespace OpenSim
     public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback
     {
         
+	LLUUID SimUUID;
 	//private SimConfig Cfg;
         private IGenericConfig localConfig;
         //private IGenericConfig remoteConfig;
@@ -110,20 +111,9 @@ namespace OpenSim
                 Console.WriteLine(e.Message);
             }
             m_console.WriteLine("Main.cs:Startup() - Loading configuration");
-            string configfromgrid = localConfig.GetAttribute("ConfigFromGrid");
-            if (configfromgrid == "true")
-            {
-                //config from remote server is not implemented yet
-                //this.remoteConfig = new RemoteConfig(localConfig.GetAttribute("RemoteConfigURL"), localConfig.GetAttribute("SimUUID"));
-                //this.remoteConfig.LoadData();   
-                //this.regionData.InitConfig(this.m_sandbox, this.remoteConfig);
-                //this.remoteConfig.Close();
-            }
-            else
-            {
-                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
+            this.regionData.InitConfig(this.m_sandbox, this.localConfig);
+            SimUUID = new LLUUID(localConfig.GetAttribute("SimUUID"));
+	    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)
-- 
cgit v1.1