aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/InventoryConfig.cs
diff options
context:
space:
mode:
authorlbsa712007-11-01 19:19:05 +0000
committerlbsa712007-11-01 19:19:05 +0000
commit4fad66f855544b9298ae2216c58c0f44009358a5 (patch)
tree07747305928e0072230b31c399d8a7e76442b77f /OpenSim/Framework/InventoryConfig.cs
parentPartialy fixed a bug with collisions in BulletXPlugin. (diff)
downloadopensim-SC_OLD-4fad66f855544b9298ae2216c58c0f44009358a5.zip
opensim-SC_OLD-4fad66f855544b9298ae2216c58c0f44009358a5.tar.gz
opensim-SC_OLD-4fad66f855544b9298ae2216c58c0f44009358a5.tar.bz2
opensim-SC_OLD-4fad66f855544b9298ae2216c58c0f44009358a5.tar.xz
* Diuerse beavtificatems
Diffstat (limited to 'OpenSim/Framework/InventoryConfig.cs')
-rw-r--r--OpenSim/Framework/InventoryConfig.cs42
1 files changed, 24 insertions, 18 deletions
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 8e64b68..1233196 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -1,7 +1,3 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Framework 1namespace OpenSim.Framework
6{ 2{
7 /// <summary> 3 /// <summary>
@@ -23,18 +19,28 @@ namespace OpenSim.Framework
23 19
24 public InventoryConfig(string description, string filename) 20 public InventoryConfig(string description, string filename)
25 { 21 {
26 configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); 22 configMember =
23 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
27 configMember.performConfigurationRetrieve(); 24 configMember.performConfigurationRetrieve();
28 } 25 }
29 26
30 public void loadConfigurationOptions() 27 public void loadConfigurationOptions()
31 { 28 {
32 configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false); 29 configMember.addConfigurationOption("default_startup_message",
33 configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString(), false); 30 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
34 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); 31 "Default Startup Message", "Welcome to OGS", false);
35 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false); 32 configMember.addConfigurationOption("default_user_server",
36 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 33 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
37 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Http Listener port", DefaultHttpPort.ToString(), false); 34 "Default User Server URI",
35 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString(), false);
36 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
37 "Key to send to user server", "null", false);
38 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
39 "Key to expect from user server", "null", false);
40 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
41 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
42 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
43 "Http Listener port", DefaultHttpPort.ToString(), false);
38 } 44 }
39 45
40 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 46 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -42,26 +48,26 @@ namespace OpenSim.Framework
42 switch (configuration_key) 48 switch (configuration_key)
43 { 49 {
44 case "default_startup_message": 50 case "default_startup_message":
45 this.DefaultStartupMsg = (string)configuration_result; 51 DefaultStartupMsg = (string) configuration_result;
46 break; 52 break;
47 case "default_user_server": 53 case "default_user_server":
48 this.UserServerURL = (string)configuration_result; 54 UserServerURL = (string) configuration_result;
49 break; 55 break;
50 case "user_send_key": 56 case "user_send_key":
51 this.UserSendKey = (string)configuration_result; 57 UserSendKey = (string) configuration_result;
52 break; 58 break;
53 case "user_recv_key": 59 case "user_recv_key":
54 this.UserRecvKey = (string)configuration_result; 60 UserRecvKey = (string) configuration_result;
55 break; 61 break;
56 case "database_provider": 62 case "database_provider":
57 this.DatabaseProvider = (string)configuration_result; 63 DatabaseProvider = (string) configuration_result;
58 break; 64 break;
59 case "http_port": 65 case "http_port":
60 HttpPort = (int)configuration_result; 66 HttpPort = (int) configuration_result;
61 break; 67 break;
62 } 68 }
63 69
64 return true; 70 return true;
65 } 71 }
66 } 72 }
67} 73} \ No newline at end of file