From 8e7a39cfc6cb979a15224ff801141d606048d220 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Thu, 19 Oct 2023 01:32:07 +0300 Subject: SL-20442 Update contributions.txt --- doc/contributions.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 3de668c1f0..304145c3e3 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -902,6 +902,8 @@ Korvel Noh Kunnis Basiat VWR-82 VWR-102 +Kyler Eastridge + SL-20442 Lance Corrimal STORM-1910 VWR-25269 -- cgit v1.3 From e78556be9a90b3ad642bf6bb3feacc10e3e91571 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Thu, 19 Oct 2023 01:38:55 +0300 Subject: SL-20442 Update contributions.txt: name fix --- doc/contributions.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 304145c3e3..cde1da47a9 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -381,6 +381,7 @@ Chaser Zaks BUG-225599 BUG-227485 SL-16874 + SL-20442 Cherry Cheevers ChickyBabes Zuzu Chorazin Allen @@ -902,8 +903,6 @@ Korvel Noh Kunnis Basiat VWR-82 VWR-102 -Kyler Eastridge - SL-20442 Lance Corrimal STORM-1910 VWR-25269 -- cgit v1.3 From 1e47b78f1717b6cf56e5b13e0c179c6985b447d8 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Tue, 24 Oct 2023 19:14:26 +0300 Subject: SL-20524 Update contributions.txt --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index cde1da47a9..adc6e92941 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -239,6 +239,7 @@ Ansariel Hiller SL-18432 SL-19140 SL-4126 + SL-20524 Aralara Rajal Arare Chantilly CHUIBUG-191 -- cgit v1.3 From e1fc7679f251a5cead135cbe78fcdfdfc749a3e2 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Thu, 9 Nov 2023 23:21:18 +0200 Subject: DRTVWR-594 Update contributions.txt --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 3de668c1f0..46dbe54cf2 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -841,6 +841,7 @@ Kadah Coba Jondan Lundquist Joosten Briebers MAINT-7074 + BUG-225288 Josef Munster Josette Windlow Juilan Tripsa -- cgit v1.3 From e5ef481cd3e3f07fbb39ccf07ae71718d54ffaa6 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 9 Jan 2024 00:19:39 +0200 Subject: SL-20781 Follow up on boost to std replacement --- doc/contributions.txt | 2 ++ indra/llappearance/llavatarappearance.cpp | 14 -------------- indra/llprimitive/lldaeloader.cpp | 4 +--- indra/llprimitive/llgltfloader.cpp | 2 -- 4 files changed, 3 insertions(+), 19 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index a097aad7f6..fa47afe579 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -64,6 +64,8 @@ Aimee Trescothick VWR-14711 VWR-14712 VWR-15454 +AiraYumi + SL-20781 (github PR #613) Alejandro Rosenthal VWR-1184 Aleric Inglewood diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index b9c3aee839..b430c4c6aa 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -24,12 +24,6 @@ * $/LicenseInfo$ */ -#if LL_MSVC -// disable warning about boost::lexical_cast returning uninitialized data -// when it fails to parse the string -#pragma warning (disable:4701) -#endif - #include "linden_common.h" #include "llavatarappearance.h" @@ -46,14 +40,6 @@ #include "boost/bind.hpp" #include "boost/tokenizer.hpp" - -#if LL_MSVC -// disable boost::lexical_cast warning -#pragma warning (disable:4702) -#endif - -#include - using namespace LLAvatarAppearanceDefines; //----------------------------------------------------------------------------- diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 2e4b013b77..2c357e1ac5 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -53,8 +53,6 @@ #pragma warning (default : 4264) #endif -#include - #include "lldaeloader.h" #include "llsdserialize.h" #include "lljoint.h" @@ -2385,7 +2383,7 @@ std::string LLDAELoader::getElementLabel(daeElement *element) if (ind > 0) { - index_string = "_" + boost::lexical_cast(ind); + index_string = "_" + std::to_string(ind); } // if parent has a name or ID, use it diff --git a/indra/llprimitive/llgltfloader.cpp b/indra/llprimitive/llgltfloader.cpp index 7394f99794..8e498158d6 100644 --- a/indra/llprimitive/llgltfloader.cpp +++ b/indra/llprimitive/llgltfloader.cpp @@ -48,8 +48,6 @@ // TODO: includes inherited from dae loader. Validate / prune -#include - #include "llsdserialize.h" #include "lljoint.h" -- cgit v1.3