diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-09-08 01:02:06 +0200 |
|---|---|---|
| committer | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-09-08 01:02:06 +0200 |
| commit | c30208d598d43779cea7b5de50c44d4b21b16487 (patch) | |
| tree | b1ffdbac63d73bc66a89a259f86edb18b4039832 /indra | |
| parent | d8cc5688eff5b540f8653a1bc39e0644b1da8d03 (diff) | |
SL-19951 Organize emoji categories in groups (fix for German)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llemojidictionary.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llfloateremojipicker.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp index cdcf5a93d6..89758f538b 100644 --- a/indra/llui/llemojidictionary.cpp +++ b/indra/llui/llemojidictionary.cpp @@ -204,7 +204,8 @@ void LLEmojiDictionary::loadTranslations() { const LLSD& sd = *it; const std::string& name = sd["Name"].asStringRef(); - const std::string& category = sd["Category"].asStringRef(); + std::string category = sd["Category"].asString(); + LLStringUtil::toLower(category); if (!name.empty() && !category.empty()) { mTranslations[name] = category; diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp index eea9c685b3..d24f627cdf 100644 --- a/indra/newview/llfloateremojipicker.cpp +++ b/indra/newview/llfloateremojipicker.cpp @@ -534,10 +534,9 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize) for (const LLEmojiGroup& group : groups) { // List all categories in group - for (std::string category : group.Categories) + for (const std::string& category : group.Categories) { // List all emojis in category - LLStringUtil::toLower(category); const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category); if (item != category2Descr.end()) { @@ -549,10 +548,9 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize) else { // List all categories in the selected group - for (std::string category : groups[sSelectedGroupIndex].Categories) + for (const std::string& category : groups[sSelectedGroupIndex].Categories) { // List all emojis in category - LLStringUtil::toLower(category); const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category); if (item != category2Descr.end()) { |