From bb97f3bf03cfa776b09dc2c0929fbb100a11c775 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Thu, 18 May 2023 07:47:54 +0200 Subject: [PATCH 1/6] SL-19575 Create emoji gallery (use ::value_type in LLEmojiDictionary typedefs) --- indra/llui/llemojidictionary.h | 6 +++--- indra/newview/llfloateremojipicker.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) 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()) From 2e57a6978e388c9c4b3682af388d0a205dd53367 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 18 May 2023 16:27:52 -0700 Subject: [PATCH 2/6] Trigger a new TeamCity build --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d4d962abf4..c57140af9c 100644 --- a/README.md +++ b/README.md @@ -41,4 +41,3 @@ pull requests and more. See the [open source portal][] for details. [download]: https://secondlife.com/support/downloads/ [tpv]: http://wiki.secondlife.com/wiki/Third_Party_Viewer_Directory [open source portal]: http://wiki.secondlife.com/wiki/Open_Source_Portal - From fbccf6119dbb5c5f6bdc0379247439af38ffb44f Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 23 May 2023 11:11:13 -0700 Subject: [PATCH 3/6] DRTVWR-489: Pull in a new build of 3p-colladadom that has the same version for all 3 platforms/bit widths (580295) - previously, the macOS version was different and the DRTVWR Readiness Script got sad about it --- autobuild.xml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index d6e1c7c9ab..d7c3291b14 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1,5 +1,6 @@ - + + installables SDL @@ -235,9 +236,9 @@ archive hash - df05eee28649996c78a47dd054de2a47 + 4e34187bee5e61210514fad9269a2856 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/115308/993050/colladadom-2.3.580295-darwin64-580295.tar.bz2 name darwin64 @@ -259,9 +260,9 @@ archive hash - 6752b4f098a522bb22b6334cdfba7614 + 12b400f26a141a9dccefd684f60a16a2 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/115310/993062/colladadom-2.3.580295-windows-580295.tar.bz2 name windows @@ -271,16 +272,16 @@ archive hash - 81de6dc4a79b547a25d0040370c42fec + 51374b87bab088470316048e48b4687f 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/115309/993056/colladadom-2.3.580295-windows64-580295.tar.bz2 name windows64 version - 2.3.579218 + 2.3.580295 cubemaptoequirectangular @@ -3635,4 +3636,5 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors autobuild version 1.3 - + + From b6d4a373a4da3478a48f24e8e6b3d1d97a1611b6 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 24 May 2023 11:58:00 -0700 Subject: [PATCH 4/6] DRTVWR-489: Trying to determine why the DRTVWR Readiness Report gets sad about the NanoSVG package - I didn't think it's analysis applied to Linux 3p packages but maybe it does --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index d7c3291b14..dc4056afbe 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2093,9 +2093,9 @@ archive hash - c5a2ae5ecc8ade5a85b674e4426d6403 + 4e76a6e967bacf2bc9bb92a16ab26a93 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/109527/952888/nanosvg-2022.09.27-linux-577709.tar.bz2 name linux From 7feba334157a97a19b558cc0dd5b2b151f129572 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 25 May 2023 10:33:45 -0700 Subject: [PATCH 5/6] DRTVWR-489: Update NanoSVG build to keep readiness report happier. Remove reference to Linux version of ColladaDOM - out of date, we don't have a newer build and it's making the Readiness Report sad. --- autobuild.xml | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index dc4056afbe..50dff9f41c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -243,18 +243,6 @@ name darwin64 - linux64 - - archive - - hash - c90613240ba3e3a171d3379275ae4ee3 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/9695/45732/colladadom-2.3.509683-linux64-509683.tar.bz2 - - name - linux64 - windows archive @@ -2081,9 +2069,9 @@ archive hash - bee6bf71cec184ab26c89c486fc5f427 + 69d324948b1fce45dc2fea7d9d4f235d 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/115396/993659/nanosvg-2022.09.27-darwin64-580337.tar.bz2 name darwin64 @@ -2093,9 +2081,9 @@ archive hash - 4e76a6e967bacf2bc9bb92a16ab26a93 + 84698f044598ff79e255965f3d1c3e80 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109527/952888/nanosvg-2022.09.27-linux-577709.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115397/993664/nanosvg-2022.09.27-linux-580337.tar.bz2 name linux @@ -2105,9 +2093,9 @@ archive hash - b7d1baa8003f64bed4efc2c163ee7e26 + 1c475d446cfbd4533de194149a5c456e 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/115400/993676/nanosvg-2022.09.27-windows-580337.tar.bz2 name windows @@ -2117,9 +2105,9 @@ archive hash - b8b51ad6b65be5bbc1470ee939c6bfae + 5236f7db7424ee4d00783bc8a17cf457 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/115399/993677/nanosvg-2022.09.27-windows64-580337.tar.bz2 name windows64 From 886c6089672cc24a4ce5d2f84f388087e7d6281b Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 30 May 2023 16:14:45 -0700 Subject: [PATCH 6/6] DRTVWR-489: Incorporate new 3p libs for Collada and NanoSVG that have both been built after merging with master (and VS 2022 for Collada DOM). --- autobuild.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 50dff9f41c..899ef96297 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -236,9 +236,9 @@ archive hash - 4e34187bee5e61210514fad9269a2856 + cb76a5dcef6577fefff3f070029a4012 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115308/993050/colladadom-2.3.580295-darwin64-580295.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115496/994482/colladadom-2.3.580380-darwin64-580380.tar.bz2 name darwin64 @@ -248,9 +248,9 @@ archive hash - 12b400f26a141a9dccefd684f60a16a2 + 31996b4f4bbf478298edcd28a6581f92 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115310/993062/colladadom-2.3.580295-windows-580295.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115498/994495/colladadom-2.3.580380-windows-580380.tar.bz2 name windows @@ -260,16 +260,16 @@ archive hash - 51374b87bab088470316048e48b4687f + 9b0de47cd59e1aa88617d751c40dcff7 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115309/993056/colladadom-2.3.580295-windows64-580295.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.580295 + 2.3.580380 cubemaptoequirectangular @@ -2069,9 +2069,9 @@ archive hash - 69d324948b1fce45dc2fea7d9d4f235d + 32ead724319c2ea6f65fc5be0e3157cc url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115396/993659/nanosvg-2022.09.27-darwin64-580337.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115452/994130/nanosvg-2022.09.27-darwin64-580364.tar.bz2 name darwin64 @@ -2093,9 +2093,9 @@ archive hash - 1c475d446cfbd4533de194149a5c456e + 4e56202b09c026e08fc51116b22feabc url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115400/993676/nanosvg-2022.09.27-windows-580337.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115456/994153/nanosvg-2022.09.27-windows-580364.tar.bz2 name windows @@ -2105,9 +2105,9 @@ archive hash - 5236f7db7424ee4d00783bc8a17cf457 + ee61ff8b866be04c325f1fe2db516d71 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115399/993677/nanosvg-2022.09.27-windows64-580337.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115454/994144/nanosvg-2022.09.27-windows64-580364.tar.bz2 name windows64