diff options
author | MW | 2007-04-04 19:55:31 +0000 |
---|---|---|
committer | MW | 2007-04-04 19:55:31 +0000 |
commit | 0a377238f8e645f708b67bca1d6bb7ce879bd4a4 (patch) | |
tree | 01c70b1ce5c6f34e6716bec9c7878b8dbc5b9133 /OpenSim.RegionServer/OpenSimMain.cs | |
parent | no SimUUID in OpenSimMain (diff) | |
download | opensim-SC_OLD-0a377238f8e645f708b67bca1d6bb7ce879bd4a4.zip opensim-SC_OLD-0a377238f8e645f708b67bca1d6bb7ce879bd4a4.tar.gz opensim-SC_OLD-0a377238f8e645f708b67bca1d6bb7ce879bd4a4.tar.bz2 opensim-SC_OLD-0a377238f8e645f708b67bca1d6bb7ce879bd4a4.tar.xz |
more work on Primitive2
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/OpenSimMain.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index e609b6c..7b0bd4b 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim | |||
54 | 54 | ||
55 | public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback | 55 | public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback |
56 | { | 56 | { |
57 | //private SimConfig Cfg; | 57 | //private SimConfig Cfg; |
58 | private IGenericConfig localConfig; | 58 | private IGenericConfig localConfig; |
59 | //private IGenericConfig remoteConfig; | 59 | //private IGenericConfig remoteConfig; |
60 | private PhysicsManager physManager; | 60 | private PhysicsManager physManager; |
@@ -110,8 +110,9 @@ namespace OpenSim | |||
110 | } | 110 | } |
111 | m_console.WriteLine("Main.cs:Startup() - Loading configuration"); | 111 | m_console.WriteLine("Main.cs:Startup() - Loading configuration"); |
112 | this.regionData.InitConfig(this.m_sandbox, this.localConfig); | 112 | this.regionData.InitConfig(this.m_sandbox, this.localConfig); |
113 | regionData.SimUUID = new LLUUID(localConfig.GetAttribute("SimUUID")); | 113 | //regionData.SimUUID = new LLUUID(localConfig.GetAttribute("SimUUID")); //don't need as regionData.SimUUID is already set through the above line |
114 | 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 |
115 | |||
115 | 116 | ||
116 | GridServers = new Grid(); | 117 | GridServers = new Grid(); |
117 | if (m_sandbox) | 118 | if (m_sandbox) |