diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/UserConfig.cs | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index 8ae8f7e..c176bbf 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs | |||
@@ -34,28 +34,24 @@ namespace OpenSim.Framework | |||
34 | /// </summary> | 34 | /// </summary> |
35 | public class UserConfig | 35 | public class UserConfig |
36 | { | 36 | { |
37 | public string DefaultStartupMsg = String.Empty; | ||
38 | public string GridServerURL = String.Empty; | ||
39 | public string GridSendKey = String.Empty; | ||
40 | public string GridRecvKey = String.Empty; | ||
41 | |||
42 | public string InventoryUrl = String.Empty; | ||
43 | |||
44 | public string DatabaseProvider = String.Empty; | ||
45 | |||
46 | public static uint DefaultHttpPort = 8002; | 37 | public static uint DefaultHttpPort = 8002; |
47 | public static bool DefaultHttpSSL = false; | 38 | public static bool DefaultHttpSSL = false; |
48 | public uint HttpPort = DefaultHttpPort; | 39 | private ConfigurationMember configMember; |
49 | public bool HttpSSL = DefaultHttpSSL; | 40 | public string DatabaseProvider = String.Empty; |
41 | public string DefaultStartupMsg = String.Empty; | ||
50 | public uint DefaultX = 1000; | 42 | public uint DefaultX = 1000; |
51 | public uint DefaultY = 1000; | 43 | public uint DefaultY = 1000; |
52 | 44 | public string GridRecvKey = String.Empty; | |
53 | private ConfigurationMember configMember; | 45 | public string GridSendKey = String.Empty; |
46 | public string GridServerURL = String.Empty; | ||
47 | public uint HttpPort = DefaultHttpPort; | ||
48 | public bool HttpSSL = DefaultHttpSSL; | ||
49 | public string InventoryUrl = String.Empty; | ||
54 | 50 | ||
55 | public UserConfig(string description, string filename) | 51 | public UserConfig(string description, string filename) |
56 | { | 52 | { |
57 | configMember = | 53 | configMember = |
58 | new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration,true); | 54 | new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true); |
59 | configMember.performConfigurationRetrieve(); | 55 | configMember.performConfigurationRetrieve(); |
60 | } | 56 | } |
61 | 57 | ||
@@ -131,4 +127,4 @@ namespace OpenSim.Framework | |||
131 | return true; | 127 | return true; |
132 | } | 128 | } |
133 | } | 129 | } |
134 | } | 130 | } \ No newline at end of file |