summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Lihatskiy <andreylproductengine@lindenlab.com>2020-04-28 17:31:50 +0000
committerAndrey Lihatskiy <andreylproductengine@lindenlab.com>2020-04-28 17:31:50 +0000
commitd3b10072f4c52b01c8d77ad1990d69dd89fc1310 (patch)
tree177e2fd52f0a92c85e1fbd9c09d5eabfaa28b5ed /indra
parent49db074be4a778153bf88d7a3846068b43912a7d (diff)
parentec77b2e0ea1504f767f93868d7c4580bae078cc0 (diff)
Merged in DRTVWR-460 (pull request #91)
SL-13133 Numerical camera preset names sorting order fix Approved-by: Maxim Nikolenko
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpresetsmanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index 4dbd6a523d..c267c3c699 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -208,7 +208,7 @@ void LLPresetsManager::loadPresetNamesFromDir(const std::string& subdirectory, p
if (IS_CAMERA)
{
- mPresetNames.sort();
+ mPresetNames.sort(LLStringUtil::precedesDict);
if (default_option == DEFAULT_BOTTOM)
{
mPresetNames.push_back(PRESETS_FRONT_VIEW);