diff --git a/autobuild.xml b/autobuild.xml index 02141835b7..1a1ee28198 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1,5 +1,6 @@ - + + installables SDL2 @@ -723,9 +724,9 @@ archive hash - df05eee28649996c78a47dd054de2a47 + cb76a5dcef6577fefff3f070029a4012 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112764/977018/colladadom-2.3.579218-darwin64-579218.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115496/994482/colladadom-2.3.580380-darwin64-580380.tar.bz2 name darwin64 @@ -747,9 +748,9 @@ archive hash - 6752b4f098a522bb22b6334cdfba7614 + 31996b4f4bbf478298edcd28a6581f92 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112771/977087/colladadom-2.3.579224-windows-579224.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115498/994495/colladadom-2.3.580380-windows-580380.tar.bz2 name windows @@ -759,16 +760,16 @@ archive hash - 81de6dc4a79b547a25d0040370c42fec + 9b0de47cd59e1aa88617d751c40dcff7 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112770/977082/colladadom-2.3.579224-windows64-579224.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115497/994489/colladadom-2.3.580380-windows64-580380.tar.bz2 name windows64 version - 2.3.579218 + 2.3.580380 cubemaptoequirectangular @@ -2558,9 +2559,9 @@ archive hash - bee6bf71cec184ab26c89c486fc5f427 + 32ead724319c2ea6f65fc5be0e3157cc url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109526/952883/nanosvg-2022.09.27-darwin64-577709.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115452/994130/nanosvg-2022.09.27-darwin64-580364.tar.bz2 name darwin64 @@ -2570,9 +2571,9 @@ archive hash - c5a2ae5ecc8ade5a85b674e4426d6403 + 84698f044598ff79e255965f3d1c3e80 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107186/935576/nanosvg-2022.09.27-linux-576467.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115397/993664/nanosvg-2022.09.27-linux-580337.tar.bz2 name linux @@ -2582,9 +2583,9 @@ archive hash - b7d1baa8003f64bed4efc2c163ee7e26 + 4e56202b09c026e08fc51116b22feabc url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109529/952902/nanosvg-2022.09.27-windows-577709.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115456/994153/nanosvg-2022.09.27-windows-580364.tar.bz2 name windows @@ -2594,9 +2595,9 @@ archive hash - b8b51ad6b65be5bbc1470ee939c6bfae + ee61ff8b866be04c325f1fe2db516d71 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109528/952895/nanosvg-2022.09.27-windows64-577709.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115454/994144/nanosvg-2022.09.27-windows64-580364.tar.bz2 name windows64 @@ -4660,4 +4661,5 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors autobuild version 1.3 - + + diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h index cc26f75ea3..1507ebfad3 100644 --- a/indra/llui/llemojidictionary.h +++ b/indra/llui/llemojidictionary.h @@ -57,11 +57,11 @@ class LLEmojiDictionary : public LLParamSingleton, public LLI public: typedef std::map emoji2descr_map_t; - typedef std::pair emoji2descr_item_t; + typedef emoji2descr_map_t::value_type emoji2descr_item_t; typedef std::map code2descr_map_t; - typedef std::pair code2descr_item_t; + typedef code2descr_map_t::value_type code2descr_item_t; typedef std::map> cat2descrs_map_t; - typedef std::pair> cat2descrs_item_t; + typedef cat2descrs_map_t::value_type cat2descrs_item_t; static void initClass(); LLWString findMatchingEmojis(const std::string& needle) const; diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp index 98fe1e7ca1..7fbaaaaa89 100644 --- a/indra/newview/llfloateremojipicker.cpp +++ b/indra/newview/llfloateremojipicker.cpp @@ -123,7 +123,7 @@ BOOL LLFloaterEmojiPicker::postBuild() mCategory->setCommitCallback([this](LLUICtrl*, const LLSD&) { onCategoryCommit(); }); const LLEmojiDictionary::cat2descrs_map_t& cat2Descrs = LLEmojiDictionary::instance().getCategory2Descrs(); mCategory->clearRows(); - for (const LLEmojiDictionary::cat2descrs_item_t item : cat2Descrs) + for (const LLEmojiDictionary::cat2descrs_item_t& item : cat2Descrs) { std::string value = item.first; std::string name = value; @@ -155,9 +155,9 @@ void LLFloaterEmojiPicker::fillEmojis() mEmojis->clearRows(); const LLEmojiDictionary::emoji2descr_map_t& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr(); - for (const LLEmojiDictionary::emoji2descr_item_t it : emoji2Descr) + for (const LLEmojiDictionary::emoji2descr_item_t& item : emoji2Descr) { - const LLEmojiDescriptor* descr = it.second; + const LLEmojiDescriptor* descr = item.second; if (!mSelectedCategory.empty() && !matchesCategory(descr)) continue; @@ -169,7 +169,7 @@ void LLFloaterEmojiPicker::fillEmojis() // The following line adds default monochrome view of the emoji (is shown as an example) //params.columns.add().column("look").value(wstring_to_utf8str(LLWString(1, it.first))); params.columns.add().column("name").value(descr->Name); - mEmojis->addRow(new LLEmojiScrollListItem(it.first, params), params); + mEmojis->addRow(new LLEmojiScrollListItem(item.first, params), params); } if (mEmojis->getItemCount())