diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Framework/UserConfig.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/UserConfig.cs')
| -rw-r--r-- | OpenSim/Framework/UserConfig.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index 16f265c..0fa82cf 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs | |||
| @@ -133,7 +133,7 @@ namespace OpenSim.Framework | |||
| 133 | m_configMember.addConfigurationOption("library_location", | 133 | m_configMember.addConfigurationOption("library_location", |
| 134 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 134 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
| 135 | "Path to library control file", | 135 | "Path to library control file", |
| 136 | string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false); | 136 | string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false); |
| 137 | 137 | ||
| 138 | m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 138 | m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
| 139 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); | 139 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); |