aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2007-10-19 10:37:38 +0000
committerMW2007-10-19 10:37:38 +0000
commit373372ca3e47a4753ad14abb0ae1eff194e5f8ff (patch)
tree8d105d3b3c4e6179fb484cf995a179685a82e07e /OpenSim/Framework
parentVS .sln and proj files for sqlite (diff)
downloadopensim-SC-373372ca3e47a4753ad14abb0ae1eff194e5f8ff.zip
opensim-SC-373372ca3e47a4753ad14abb0ae1eff194e5f8ff.tar.gz
opensim-SC-373372ca3e47a4753ad14abb0ae1eff194e5f8ff.tar.bz2
opensim-SC-373372ca3e47a4753ad14abb0ae1eff194e5f8ff.tar.xz
couple of tiny changes to what is outputted to the console during the start up phase (like changed the bit where it asks for sim uuid to asking for region id). should have no effect on anything.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/General/Types/RegionInfo.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 90383d3..8ae61fc 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -198,11 +198,13 @@ namespace OpenSim.Framework.Types
198 estateSettings = new EstateSettings(); 198 estateSettings = new EstateSettings();
199 } 199 }
200 200
201 //not in use, should swap to nini though.
201 public void LoadFromNiniSource(IConfigSource source) 202 public void LoadFromNiniSource(IConfigSource source)
202 { 203 {
203 this.LoadFromNiniSource(source, "RegionInfo"); 204 this.LoadFromNiniSource(source, "RegionInfo");
204 } 205 }
205 206
207 //not in use, should swap to nini though.
206 public void LoadFromNiniSource(IConfigSource source, string sectionName) 208 public void LoadFromNiniSource(IConfigSource source, string sectionName)
207 { 209 {
208 string errorMessage = ""; 210 string errorMessage = "";
@@ -246,8 +248,8 @@ namespace OpenSim.Framework.Types
246 248
247 public void loadConfigurationOptions() 249 public void loadConfigurationOptions()
248 { 250 {
249 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "UUID of Simulator (Default is recommended, random UUID)", LLUUID.Random().ToString(), true); 251 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "UUID of Region (Default is recommended, random UUID)", LLUUID.Random().ToString(), true);
250 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Simulator Name", "OpenSim Test", false); 252 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Region Name", "OpenSim Test", false);
251 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (X Axis)", "1000", false); 253 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (X Axis)", "1000", false);
252 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (Y Axis)", "1000", false); 254 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (Y Axis)", "1000", false);
253 configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false); 255 configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);