diff options
Diffstat (limited to 'OpenSim/Framework/UserConfig.cs')
-rw-r--r-- | OpenSim/Framework/UserConfig.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index 87ba271..cc048b7 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs | |||
@@ -47,6 +47,7 @@ namespace OpenSim.Framework | |||
47 | public uint HttpPort = DefaultHttpPort; | 47 | public uint HttpPort = DefaultHttpPort; |
48 | public bool HttpSSL = DefaultHttpSSL; | 48 | public bool HttpSSL = DefaultHttpSSL; |
49 | public uint DefaultUserLevel = 0; | 49 | public uint DefaultUserLevel = 0; |
50 | public string LibraryXmlfile = ""; | ||
50 | 51 | ||
51 | private Uri m_inventoryUrl; | 52 | private Uri m_inventoryUrl; |
52 | 53 | ||
@@ -109,6 +110,11 @@ namespace OpenSim.Framework | |||
109 | "Default Inventory Server URI", | 110 | "Default Inventory Server URI", |
110 | "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort + "/", | 111 | "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort + "/", |
111 | false); | 112 | false); |
113 | configMember.addConfigurationOption("library_location", | ||
114 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | ||
115 | "Path to library control file", | ||
116 | string.Format(".{0}inventory{0}Libraries.xml", System.IO.Path.DirectorySeparatorChar), false); | ||
117 | |||
112 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 118 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
113 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); | 119 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); |
114 | configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 120 | configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
@@ -173,7 +179,10 @@ namespace OpenSim.Framework | |||
173 | 179 | ||
174 | case "default_loginLevel": | 180 | case "default_loginLevel": |
175 | DefaultUserLevel = (uint)configuration_result; | 181 | DefaultUserLevel = (uint)configuration_result; |
176 | break; | 182 | break; |
183 | case "library_location": | ||
184 | LibraryXmlfile = (string)configuration_result; | ||
185 | break; | ||
177 | } | 186 | } |
178 | 187 | ||
179 | return true; | 188 | return true; |