aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/InventoryConfig.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/InventoryConfig.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/InventoryConfig.cs')
-rw-r--r--OpenSim/Framework/InventoryConfig.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index aafb6de..858d168 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 public string DatabaseConnect = String.Empty; 37 public string DatabaseConnect = String.Empty;
38 public string DatabaseProvider = String.Empty; 38 public string DatabaseProvider = String.Empty;
39 public string DefaultStartupMsg = String.Empty; 39 public string DefaultStartupMsg = String.Empty;
40 public uint HttpPort = DefaultSettings.DefaultInventoryServerHttpPort; 40 public uint HttpPort = ConfigSettings.DefaultInventoryServerHttpPort;
41 public string InventoryServerURL = String.Empty; 41 public string InventoryServerURL = String.Empty;
42 public string UserServerURL = String.Empty; 42 public string UserServerURL = String.Empty;
43 public string AssetServerURL = String.Empty; 43 public string AssetServerURL = String.Empty;
@@ -70,7 +70,7 @@ namespace OpenSim.Framework
70 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 70 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
71 "Database Connect String", "", false); 71 "Database Connect String", "", false);
72 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 72 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
73 "Http Listener port", DefaultSettings.DefaultInventoryServerHttpPort.ToString(), false); 73 "Http Listener port", ConfigSettings.DefaultInventoryServerHttpPort.ToString(), false);
74 m_configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 74 m_configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
75 "Enable session lookup security", "False", false); 75 "Enable session lookup security", "False", false);
76 m_configMember.addConfigurationOption("region_access", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 76 m_configMember.addConfigurationOption("region_access", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,