From 40394752f7f757012c032746ea0de48aa3c0323c Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 7 Apr 2020 21:26:13 +0300 Subject: SL-12991 [Camera Presets] Sort all Camera preset lists in the same way --- indra/newview/llpresetsmanager.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index b1a94be68c..fd89a1fcb6 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -206,12 +206,15 @@ void LLPresetsManager::loadPresetNamesFromDir(const std::string& subdirectory, p } } - if (IS_CAMERA && (default_option == DEFAULT_BOTTOM)) + if (IS_CAMERA) { - mPresetNames.sort(); - mPresetNames.push_back(PRESETS_FRONT_VIEW); - mPresetNames.push_back(PRESETS_REAR_VIEW); - mPresetNames.push_back(PRESETS_SIDE_VIEW); + mPresetNames.sort(); + if (default_option == DEFAULT_BOTTOM) + { + mPresetNames.push_back(PRESETS_FRONT_VIEW); + mPresetNames.push_back(PRESETS_REAR_VIEW); + mPresetNames.push_back(PRESETS_SIDE_VIEW); + } } presets = mPresetNames; -- cgit v1.2.3