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 1fae237c158a8f501ae80d030b1a8cfdd8d2d8a2 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 22 Nov 2023 00:37:43 +0200 Subject: SL-20610 Crash when unticking animesh on an attachment --- doc/contributions.txt | 1 + indra/newview/llspatialpartition.cpp | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 3de668c1f0..581dab379d 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -290,6 +290,7 @@ Beq Janus SL-18637 SL-19317 SL-19660 + SL-20610 Beth Walcher Bezilon Kasei Biancaluce Robbiani diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index a3d8986c20..cafc82964c 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -868,10 +868,9 @@ void LLSpatialGroup::rebound() LLControlAvatar* controlAvatar = bridge->mDrawable->getVObj()->getControlAvatar(); if (controlAvatar && controlAvatar->mDrawable && - controlAvatar->mControlAVBridge) + controlAvatar->mControlAVBridge && + controlAvatar->mControlAVBridge->mOctree) { - llassert(controlAvatar->mControlAVBridge->mOctree); - LLSpatialGroup* root = (LLSpatialGroup*)controlAvatar->mControlAVBridge->mOctree->getListener(0); if (this == root) { -- 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 From 79f5231db23dfa22d8981940864d1f3a450e3e02 Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Tue, 23 Jan 2024 15:45:33 -0600 Subject: Create test plan for optimizeAwayAlpha (#663) --- doc/testplans/optimize_away_alpha.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/testplans/optimize_away_alpha.md (limited to 'doc') diff --git a/doc/testplans/optimize_away_alpha.md b/doc/testplans/optimize_away_alpha.md new file mode 100644 index 0000000000..f0c8d1e8d6 --- /dev/null +++ b/doc/testplans/optimize_away_alpha.md @@ -0,0 +1,5 @@ +Textures imported via Build->Upload->Material that have an all opaque (255) alpha channel should have their alpha channel removed before upload. + +1. Make 4 images that have different colors but all 255 alpha channels +2. Upload them all using Build->Upload->Material, with one in each of the material texture slots +3. Verify that using the textures as a blinn-phong diffuse map does not make the corresponding face render in the alpha pass (face should stay visible after disabling alpha pass by unchecking Advanced->Render Types->Alpha). -- cgit v1.3