aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/OpenSimMain.cs
diff options
context:
space:
mode:
authorgareth2007-04-04 18:57:13 +0000
committergareth2007-04-04 18:57:13 +0000
commitf741e00ad8b87485d98e8bca82e4256cb30615d1 (patch)
tree3b82325fe68cae9a6a640547937217b6b270a179 /OpenSim.RegionServer/OpenSimMain.cs
parentDeleted OpenSim.Config/SimConfigDb4o, as it hasn't been used for a while now. (diff)
downloadopensim-SC_OLD-f741e00ad8b87485d98e8bca82e4256cb30615d1.zip
opensim-SC_OLD-f741e00ad8b87485d98e8bca82e4256cb30615d1.tar.gz
opensim-SC_OLD-f741e00ad8b87485d98e8bca82e4256cb30615d1.tar.bz2
opensim-SC_OLD-f741e00ad8b87485d98e8bca82e4256cb30615d1.tar.xz
Added SimUUID
Added empty POST for /sims in REST on gridserver
Diffstat (limited to 'OpenSim.RegionServer/OpenSimMain.cs')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs18
1 files changed, 4 insertions, 14 deletions
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
55 public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback 55 public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback
56 { 56 {
57 57
58 LLUUID SimUUID;
58 //private SimConfig Cfg; 59 //private SimConfig Cfg;
59 private IGenericConfig localConfig; 60 private IGenericConfig localConfig;
60 //private IGenericConfig remoteConfig; 61 //private IGenericConfig remoteConfig;
@@ -110,20 +111,9 @@ namespace OpenSim
110 Console.WriteLine(e.Message); 111 Console.WriteLine(e.Message);
111 } 112 }
112 m_console.WriteLine("Main.cs:Startup() - Loading configuration"); 113 m_console.WriteLine("Main.cs:Startup() - Loading configuration");
113 string configfromgrid = localConfig.GetAttribute("ConfigFromGrid"); 114 this.regionData.InitConfig(this.m_sandbox, this.localConfig);
114 if (configfromgrid == "true") 115 SimUUID = new LLUUID(localConfig.GetAttribute("SimUUID"));
115 { 116 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
116 //config from remote server is not implemented yet
117 //this.remoteConfig = new RemoteConfig(localConfig.GetAttribute("RemoteConfigURL"), localConfig.GetAttribute("SimUUID"));
118 //this.remoteConfig.LoadData();
119 //this.regionData.InitConfig(this.m_sandbox, this.remoteConfig);
120 //this.remoteConfig.Close();
121 }
122 else
123 {
124 this.regionData.InitConfig(this.m_sandbox, this.localConfig);
125 }
126 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
127 117
128 GridServers = new Grid(); 118 GridServers = new Grid();
129 if (m_sandbox) 119 if (m_sandbox)