aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/UserConfig.cs
diff options
context:
space:
mode:
authorlbsa712009-04-17 15:09:37 +0000
committerlbsa712009-04-17 15:09:37 +0000
commita189da844a1ec48b321674f49a81c4e0a71c8b81 (patch)
treeeb55b24007c0f221a7d9f84bdbb12282d161c777 /OpenSim/Framework/UserConfig.cs
parent* remind me to never touch EstateSettings ever again. Ever. (diff)
downloadopensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.zip
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.gz
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.bz2
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.xz
* Moved the DefaultConfig settings into already-existing ConfigSettings
Diffstat (limited to 'OpenSim/Framework/UserConfig.cs')
-rw-r--r--OpenSim/Framework/UserConfig.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index b898f89..57ead7e 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -42,8 +42,8 @@ namespace OpenSim.Framework
42 public uint DefaultY = 1000; 42 public uint DefaultY = 1000;
43 public string GridRecvKey = String.Empty; 43 public string GridRecvKey = String.Empty;
44 public string GridSendKey = String.Empty; 44 public string GridSendKey = String.Empty;
45 public uint HttpPort = DefaultSettings.DefaultUserServerHttpPort; 45 public uint HttpPort = ConfigSettings.DefaultUserServerHttpPort;
46 public bool HttpSSL = DefaultSettings.DefaultUserServerHttpSSL; 46 public bool HttpSSL = ConfigSettings.DefaultUserServerHttpSSL;
47 public uint DefaultUserLevel = 0; 47 public uint DefaultUserLevel = 0;
48 public string LibraryXmlfile = ""; 48 public string LibraryXmlfile = "";
49 49
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
112 m_configMember.addConfigurationOption("default_grid_server", 112 m_configMember.addConfigurationOption("default_grid_server",
113 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 113 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
114 "Default Grid Server URI", 114 "Default Grid Server URI",
115 "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort + "/", false); 115 "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort + "/", false);
116 m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 116 m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
117 "Key to send to grid server", "null", false); 117 "Key to send to grid server", "null", false);
118 m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 118 m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -121,12 +121,12 @@ namespace OpenSim.Framework
121 m_configMember.addConfigurationOption("default_inventory_server", 121 m_configMember.addConfigurationOption("default_inventory_server",
122 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 122 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
123 "Default Inventory Server URI", 123 "Default Inventory Server URI",
124 "http://127.0.0.1:" + DefaultSettings.DefaultInventoryServerHttpPort + "/", 124 "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort + "/",
125 false); 125 false);
126 m_configMember.addConfigurationOption("default_authentication_server", 126 m_configMember.addConfigurationOption("default_authentication_server",
127 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 127 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
128 "User Server (this) External URI for authentication keys", 128 "User Server (this) External URI for authentication keys",
129 "http://localhost:" + DefaultSettings.DefaultUserServerHttpPort + "/", 129 "http://localhost:" + ConfigSettings.DefaultUserServerHttpPort + "/",
130 false); 130 false);
131 m_configMember.addConfigurationOption("library_location", 131 m_configMember.addConfigurationOption("library_location",
132 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 132 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -139,9 +139,9 @@ namespace OpenSim.Framework
139 "Connection String for Database", "", false); 139 "Connection String for Database", "", false);
140 140
141 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 141 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
142 "Http Listener port", DefaultSettings.DefaultUserServerHttpPort.ToString(), false); 142 "Http Listener port", ConfigSettings.DefaultUserServerHttpPort.ToString(), false);
143 m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 143 m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
144 "Use SSL? true/false", DefaultSettings.DefaultUserServerHttpSSL.ToString(), false); 144 "Use SSL? true/false", ConfigSettings.DefaultUserServerHttpSSL.ToString(), false);
145 m_configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 145 m_configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
146 "Known good region X", "1000", false); 146 "Known good region X", "1000", false);
147 m_configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 147 m_configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,