diff options
Diffstat (limited to 'OpenSim/Framework/InventoryConfig.cs')
| -rw-r--r-- | OpenSim/Framework/InventoryConfig.cs | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs index 39a6930..1e22fe8 100644 --- a/OpenSim/Framework/InventoryConfig.cs +++ b/OpenSim/Framework/InventoryConfig.cs | |||
| @@ -40,6 +40,7 @@ namespace OpenSim.Framework | |||
| 40 | public string UserRecvKey = String.Empty; | 40 | public string UserRecvKey = String.Empty; |
| 41 | 41 | ||
| 42 | public string DatabaseProvider = String.Empty; | 42 | public string DatabaseProvider = String.Empty; |
| 43 | public string DatabaseConnect = String.Empty; | ||
| 43 | public static uint DefaultHttpPort = 8004; | 44 | public static uint DefaultHttpPort = 8004; |
| 44 | 45 | ||
| 45 | public uint HttpPort = DefaultHttpPort; | 46 | public uint HttpPort = DefaultHttpPort; |
| @@ -68,6 +69,8 @@ namespace OpenSim.Framework | |||
| 68 | "Key to expect from user server", "null", false); | 69 | "Key to expect from user server", "null", false); |
| 69 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 70 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
| 70 | "DLL for database provider", "OpenSim.Data.SQLite.dll", false); | 71 | "DLL for database provider", "OpenSim.Data.SQLite.dll", false); |
| 72 | configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
| 73 | "Database Connect String", "", false); | ||
| 71 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 74 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
| 72 | "Http Listener port", DefaultHttpPort.ToString(), false); | 75 | "Http Listener port", DefaultHttpPort.ToString(), false); |
| 73 | } | 76 | } |
| @@ -76,24 +79,27 @@ namespace OpenSim.Framework | |||
| 76 | { | 79 | { |
| 77 | switch (configuration_key) | 80 | switch (configuration_key) |
| 78 | { | 81 | { |
| 79 | case "default_startup_message": | 82 | case "default_startup_message": |
| 80 | DefaultStartupMsg = (string) configuration_result; | 83 | DefaultStartupMsg = (string) configuration_result; |
| 81 | break; | 84 | break; |
| 82 | case "default_user_server": | 85 | case "default_user_server": |
| 83 | UserServerURL = (string) configuration_result; | 86 | UserServerURL = (string) configuration_result; |
| 84 | break; | 87 | break; |
| 85 | case "user_send_key": | 88 | case "user_send_key": |
| 86 | UserSendKey = (string) configuration_result; | 89 | UserSendKey = (string) configuration_result; |
| 87 | break; | 90 | break; |
| 88 | case "user_recv_key": | 91 | case "user_recv_key": |
| 89 | UserRecvKey = (string) configuration_result; | 92 | UserRecvKey = (string) configuration_result; |
| 90 | break; | 93 | break; |
| 91 | case "database_provider": | 94 | case "database_provider": |
| 92 | DatabaseProvider = (string) configuration_result; | 95 | DatabaseProvider = (string) configuration_result; |
| 93 | break; | 96 | break; |
| 94 | case "http_port": | 97 | case "database_connect": |
| 95 | HttpPort = (uint) configuration_result; | 98 | DatabaseConnect = (string) configuration_result; |
| 96 | break; | 99 | break; |
| 100 | case "http_port": | ||
| 101 | HttpPort = (uint) configuration_result; | ||
| 102 | break; | ||
| 97 | } | 103 | } |
| 98 | 104 | ||
| 99 | return true; | 105 | return true; |