diff options
Diffstat (limited to 'OpenSim/Framework/General/AssetConfig.cs')
-rw-r--r-- | OpenSim/Framework/General/AssetConfig.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Framework/General/AssetConfig.cs b/OpenSim/Framework/General/AssetConfig.cs index 457369d..81cf899 100644 --- a/OpenSim/Framework/General/AssetConfig.cs +++ b/OpenSim/Framework/General/AssetConfig.cs | |||
@@ -26,10 +26,6 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Text; | ||
32 | |||
33 | namespace OpenSim.Framework | 29 | namespace OpenSim.Framework |
34 | { | 30 | { |
35 | /// <summary> | 31 | /// <summary> |
@@ -48,18 +44,22 @@ namespace OpenSim.Framework | |||
48 | 44 | ||
49 | public AssetConfig(string description, string filename) | 45 | public AssetConfig(string description, string filename) |
50 | { | 46 | { |
51 | configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); | 47 | configMember = |
48 | new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); | ||
52 | configMember.performConfigurationRetrieve(); | 49 | configMember.performConfigurationRetrieve(); |
53 | } | 50 | } |
54 | 51 | ||
55 | public void loadConfigurationOptions() | 52 | public void loadConfigurationOptions() |
56 | { | 53 | { |
57 | configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false); | 54 | configMember.addConfigurationOption("default_startup_message", |
58 | 55 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | |
59 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | 56 | "Default Startup Message", "Welcome to OGS", false); |
60 | 57 | ||
61 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false); | 58 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
59 | "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | ||
62 | 60 | ||
61 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | ||
62 | "Http Listener port", DefaultHttpPort.ToString(), false); | ||
63 | } | 63 | } |
64 | 64 | ||
65 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 65 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -67,17 +67,17 @@ namespace OpenSim.Framework | |||
67 | switch (configuration_key) | 67 | switch (configuration_key) |
68 | { | 68 | { |
69 | case "default_startup_message": | 69 | case "default_startup_message": |
70 | this.DefaultStartupMsg = (string)configuration_result; | 70 | DefaultStartupMsg = (string) configuration_result; |
71 | break; | 71 | break; |
72 | case "database_provider": | 72 | case "database_provider": |
73 | this.DatabaseProvider = (string)configuration_result; | 73 | DatabaseProvider = (string) configuration_result; |
74 | break; | 74 | break; |
75 | case "http_port": | 75 | case "http_port": |
76 | HttpPort = (uint)configuration_result; | 76 | HttpPort = (uint) configuration_result; |
77 | break; | 77 | break; |
78 | } | 78 | } |
79 | 79 | ||
80 | return true; | 80 | return true; |
81 | } | 81 | } |
82 | } | 82 | } |
83 | } | 83 | } \ No newline at end of file |