summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercamerapresets.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2020-04-07 19:15:40 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2020-04-07 19:15:40 +0300
commit3bac0d4283c8d8a7f067a302c4ec0e533457c899 (patch)
tree9d3b53db0b8994dde5a73ec98e80b88cc43a9a84 /indra/newview/llfloatercamerapresets.cpp
parent1f5bb7be28768fe5341b1ca4b5a5d366f176045e (diff)
SL-12991 [Camera Presets] Sort all Camera preset lists in the same way
Diffstat (limited to 'indra/newview/llfloatercamerapresets.cpp')
-rw-r--r--indra/newview/llfloatercamerapresets.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llfloatercamerapresets.cpp b/indra/newview/llfloatercamerapresets.cpp
index 75660e590a..300c945a85 100644
--- a/indra/newview/llfloatercamerapresets.cpp
+++ b/indra/newview/llfloatercamerapresets.cpp
@@ -55,13 +55,10 @@ void LLFloaterCameraPresets::populateList()
mPresetList->clear();
LLPresetsManager* presetsMgr = LLPresetsManager::getInstance();
- std::string presets_dir = presetsMgr->getPresetsDir(PRESETS_CAMERA);
std::list<std::string> preset_names;
- presetsMgr->loadPresetNamesFromDir(presets_dir, preset_names, DEFAULT_VIEWS_HIDE);
- preset_names.push_back(PRESETS_FRONT_VIEW);
- preset_names.push_back(PRESETS_REAR_VIEW);
- preset_names.push_back(PRESETS_SIDE_VIEW);
+ presetsMgr->loadPresetNamesFromDir(PRESETS_CAMERA, preset_names, DEFAULT_BOTTOM);
+
for (std::list<std::string>::const_iterator it = preset_names.begin(); it != preset_names.end(); ++it)
{
const std::string& name = *it;