summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2020-04-07 21:26:13 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2020-04-07 21:26:13 +0300
commit40394752f7f757012c032746ea0de48aa3c0323c (patch)
tree77b665b4988516490c737782ed0ce2fe04b41e0f /indra
parent3bac0d4283c8d8a7f067a302c4ec0e533457c899 (diff)
SL-12991 [Camera Presets] Sort all Camera preset lists in the same way
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpresetsmanager.cpp13
1 files changed, 8 insertions, 5 deletions
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;