diff options
Diffstat (limited to 'OpenSim/Framework/UserConfig.cs')
-rw-r--r-- | OpenSim/Framework/UserConfig.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index 39b1599..7ca2512 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs | |||
@@ -76,7 +76,8 @@ namespace OpenSim.Framework | |||
76 | configMember.addConfigurationOption("default_inventory_server", | 76 | configMember.addConfigurationOption("default_inventory_server", |
77 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 77 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
78 | "Default Inventory Server URI", | 78 | "Default Inventory Server URI", |
79 | "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString() + "/", false); | 79 | "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString() + "/", |
80 | false); | ||
80 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 81 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
81 | "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | 82 | "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); |
82 | 83 | ||
@@ -107,7 +108,7 @@ namespace OpenSim.Framework | |||
107 | GridRecvKey = (string) configuration_result; | 108 | GridRecvKey = (string) configuration_result; |
108 | break; | 109 | break; |
109 | case "default_inventory_server": | 110 | case "default_inventory_server": |
110 | InventoryUrl = (string)configuration_result; | 111 | InventoryUrl = (string) configuration_result; |
111 | break; | 112 | break; |
112 | case "database_provider": | 113 | case "database_provider": |
113 | DatabaseProvider = (string) configuration_result; | 114 | DatabaseProvider = (string) configuration_result; |
@@ -116,13 +117,13 @@ namespace OpenSim.Framework | |||
116 | HttpPort = (uint) configuration_result; | 117 | HttpPort = (uint) configuration_result; |
117 | break; | 118 | break; |
118 | case "http_ssl": | 119 | case "http_ssl": |
119 | HttpSSL = (bool)configuration_result; | 120 | HttpSSL = (bool) configuration_result; |
120 | break; | 121 | break; |
121 | case "default_X": | 122 | case "default_X": |
122 | DefaultX = (uint)configuration_result; | 123 | DefaultX = (uint) configuration_result; |
123 | break; | 124 | break; |
124 | case "default_Y": | 125 | case "default_Y": |
125 | DefaultY = (uint)configuration_result; | 126 | DefaultY = (uint) configuration_result; |
126 | break; | 127 | break; |
127 | } | 128 | } |
128 | 129 | ||