diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/UserConfig.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index d4ee62f..4c6b3b8 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs | |||
@@ -38,6 +38,8 @@ namespace OpenSim.Framework | |||
38 | public string GridSendKey = ""; | 38 | public string GridSendKey = ""; |
39 | public string GridRecvKey = ""; | 39 | public string GridRecvKey = ""; |
40 | 40 | ||
41 | public string InventoryUrl = ""; | ||
42 | |||
41 | public string DatabaseProvider = ""; | 43 | public string DatabaseProvider = ""; |
42 | 44 | ||
43 | public static uint DefaultHttpPort = 8002; | 45 | public static uint DefaultHttpPort = 8002; |
@@ -68,6 +70,11 @@ namespace OpenSim.Framework | |||
68 | "Key to send to grid server", "null", false); | 70 | "Key to send to grid server", "null", false); |
69 | configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 71 | configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
70 | "Key to expect from grid server", "null", false); | 72 | "Key to expect from grid server", "null", false); |
73 | |||
74 | configMember.addConfigurationOption("default_inventory_server", | ||
75 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | ||
76 | "Default Inventory Server URI", | ||
77 | "http://127.0.0.1:8004/", false); | ||
71 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 78 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
72 | "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | 79 | "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); |
73 | 80 | ||
@@ -95,6 +102,9 @@ namespace OpenSim.Framework | |||
95 | case "grid_recv_key": | 102 | case "grid_recv_key": |
96 | GridRecvKey = (string) configuration_result; | 103 | GridRecvKey = (string) configuration_result; |
97 | break; | 104 | break; |
105 | case "default_inventory_server": | ||
106 | InventoryUrl = (string)configuration_result; | ||
107 | break; | ||
98 | case "database_provider": | 108 | case "database_provider": |
99 | DatabaseProvider = (string) configuration_result; | 109 | DatabaseProvider = (string) configuration_result; |
100 | break; | 110 | break; |