aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorgareth2007-04-04 19:20:17 +0000
committergareth2007-04-04 19:20:17 +0000
commit7c2b4d1c9d944d68c2b9227aa365e6dbaf96a368 (patch)
tree2b06becdd38a9ac85eb1641f641ad78400c92aa0 /OpenSim.RegionServer
parentAdded SimUUID (diff)
downloadopensim-SC-7c2b4d1c9d944d68c2b9227aa365e6dbaf96a368.zip
opensim-SC-7c2b4d1c9d944d68c2b9227aa365e6dbaf96a368.tar.gz
opensim-SC-7c2b4d1c9d944d68c2b9227aa365e6dbaf96a368.tar.bz2
opensim-SC-7c2b4d1c9d944d68c2b9227aa365e6dbaf96a368.tar.xz
no SimUUID in OpenSimMain
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index a3dfa6d..e609b6c 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -54,8 +54,6 @@ namespace OpenSim
54 54
55 public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback 55 public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback
56 { 56 {
57
58 LLUUID SimUUID;
59 //private SimConfig Cfg; 57 //private SimConfig Cfg;
60 private IGenericConfig localConfig; 58 private IGenericConfig localConfig;
61 //private IGenericConfig remoteConfig; 59 //private IGenericConfig remoteConfig;
@@ -112,7 +110,7 @@ namespace OpenSim
112 } 110 }
113 m_console.WriteLine("Main.cs:Startup() - Loading configuration"); 111 m_console.WriteLine("Main.cs:Startup() - Loading configuration");
114 this.regionData.InitConfig(this.m_sandbox, this.localConfig); 112 this.regionData.InitConfig(this.m_sandbox, this.localConfig);
115 SimUUID = new LLUUID(localConfig.GetAttribute("SimUUID")); 113 regionData.SimUUID = new LLUUID(localConfig.GetAttribute("SimUUID"));
116 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change 114 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
117 115
118 GridServers = new Grid(); 116 GridServers = new Grid();