aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-11 18:02:22 +0000
committerJustin Clarke Casey2009-03-11 18:02:22 +0000
commitacad0328b2c50d22fe76ebb7c8de2c97c856b42f (patch)
tree2379c1ae60c22a4dcee162c5b56d21f367c05bfd /OpenSim/Region/DataSnapshot
parent* Fix silly windows prebuild borkage. To use System.Xml, the project must ha... (diff)
downloadopensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.zip
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.gz
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.bz2
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.xz
* Make all coded defaults match settings in OpenSim.ini.example
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using * OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs22
1 files changed, 16 insertions, 6 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 3013971..bc7e7b2 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot
64 64
65 //DataServices and networking 65 //DataServices and networking
66 private string m_dataServices = "noservices"; 66 private string m_dataServices = "noservices";
67 public string m_listener_port = "9000"; //TODO: Set default port over 9000 67 public string m_listener_port = NetworkServersInfo.DefaultHttpListenerPort.ToString();
68 public string m_hostname = "127.0.0.1"; 68 public string m_hostname = "127.0.0.1";
69 69
70 //Update timers 70 //Update timers
@@ -101,14 +101,24 @@ namespace OpenSim.Region.DataSnapshot
101 try 101 try
102 { 102 {
103 m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled); 103 m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
104 if (config.Configs["Startup"].GetBoolean("gridmode", true)) 104 if (config.Configs["Startup"].GetBoolean("gridmode", false))
105 { 105 {
106 m_gridinfo.Add("gridserverURL", config.Configs["Network"].GetString("grid_server_url", "harbl")); 106 m_gridinfo.Add(
107 m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl")); 107 "gridserverURL",
108 m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl")); 108 config.Configs["Network"].GetString(
109 "grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()));
110 m_gridinfo.Add(
111 "userserverURL",
112 config.Configs["Network"].GetString(
113 "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()));
114 m_gridinfo.Add(
115 "assetserverURL",
116 config.Configs["Network"].GetString(
117 "asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()));
109 } 118 }
110 119
111 m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl")); 120 m_gridinfo.Add(
121 "Name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo"));
112 m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level); 122 m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level);
113 m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period); 123 m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
114 m_maxStales = config.Configs["DataSnapshot"].GetInt("max_changes_before_update", m_maxStales); 124 m_maxStales = config.Configs["DataSnapshot"].GetInt("max_changes_before_update", m_maxStales);