diff options
| author | Jacek Antonelli | 2011-05-18 16:27:50 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2011-05-18 16:27:50 -0500 |
| commit | 822a2e93b47d1eba725faa41becf38ba63dfda9d (patch) | |
| tree | c99687f6c9206f5ef695915f02986267036d3805 /linden/indra/newview | |
| parent | Bumped version to 1.4.0 beta 1. (diff) | |
| download | meta-impy-822a2e93b47d1eba725faa41becf38ba63dfda9d.zip meta-impy-822a2e93b47d1eba725faa41becf38ba63dfda9d.tar.gz meta-impy-822a2e93b47d1eba725faa41becf38ba63dfda9d.tar.bz2 meta-impy-822a2e93b47d1eba725faa41becf38ba63dfda9d.tar.xz | |
Changed the cache and settings file names back to non-Experimental.
This effectively reverts commits 20216aa7 and 3609adb5.
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 1d62a1a..aa3de97 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
| @@ -1844,7 +1844,7 @@ bool LLAppViewer::initConfiguration() | |||
| 1844 | // - set procedural settings | 1844 | // - set procedural settings |
| 1845 | gSavedSettings.setString("ClientSettingsFile", | 1845 | gSavedSettings.setString("ClientSettingsFile", |
| 1846 | // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global"))); | 1846 | // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global"))); |
| 1847 | gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence_experimental.xml")); | 1847 | gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml")); |
| 1848 | 1848 | ||
| 1849 | gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName()); | 1849 | gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName()); |
| 1850 | 1850 | ||