From 6c663d733149b384373a7464fa5d44f3810cc7c8 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 13 Apr 2022 22:16:20 +0200 Subject: Parameter to onClickConnect must be bool, not int. (cherry picked from commit 5c6228e56a688a98606ce28077d6089adc833873) --- indra/newview/llpanelloginlistener.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llpanelloginlistener.cpp b/indra/newview/llpanelloginlistener.cpp index 33efde11f3..fb3e8dc244 100644 --- a/indra/newview/llpanelloginlistener.cpp +++ b/indra/newview/llpanelloginlistener.cpp @@ -47,5 +47,5 @@ LLPanelLoginListener::LLPanelLoginListener(LLPanelLogin* instance): void LLPanelLoginListener::onClickConnect(const LLSD&) const { - mPanel->onClickConnect(NULL); + mPanel->onClickConnect(false); } -- cgit v1.2.3 From 46824ae0e8ae72fff04b96647edca2de0d0aa849 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 13 Apr 2022 22:35:21 +0200 Subject: Semicolon at end of for loop was making sure nothing ever got done. The whole methode is questionable in doing nothing and it seems there was a deliberate change that made sure it does nothing. I am not sure what this method really is supposed to do, thus I did opt for the most basic version of "do nothing" like it was before. (cherry picked from commit 1c1a93e42e209e959f09ec46ca414a8936f4ac20) --- indra/llappearance/lltexlayer.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index a4600069ce..65ffbb1af3 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -478,18 +478,6 @@ void LLTexLayerSet::asLLSD(LLSD& sd) const { sd["visible"] = LLSD::Boolean(isVisible()); LLSD layer_list_sd; - layer_list_t::const_iterator layer_iter = mLayerList.begin(); - layer_list_t::const_iterator layer_end = mLayerList.end(); - for(; layer_iter != layer_end; ++layer_iter); - { - LLSD layer_sd; - //LLTexLayerInterface* layer = (*layer_iter); - //if (layer) - //{ - // layer->asLLSD(layer_sd); - //} - layer_list_sd.append(layer_sd); - } LLSD mask_list_sd; LLSD info_sd; sd["layers"] = layer_list_sd; -- cgit v1.2.3 From 0dc325c1e9de059d36c7b0e2c6ba997160ff1f53 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 14 Apr 2022 16:39:06 +0200 Subject: void LLTexLayerSet::asLLSD was never used, remove it completely. (cherry picked from commit 7f0259f0e767969d260514e9ea810cbde7f1d24c) --- indra/llappearance/lltexlayer.cpp | 14 -------------- indra/llappearance/lltexlayer.h | 2 -- 2 files changed, 16 deletions(-) diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index 65ffbb1af3..ca72dd5fd3 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -472,20 +472,6 @@ const std::string LLTexLayerSet::getBodyRegionName() const return mInfo->mBodyRegion; } - -// virtual -void LLTexLayerSet::asLLSD(LLSD& sd) const -{ - sd["visible"] = LLSD::Boolean(isVisible()); - LLSD layer_list_sd; - LLSD mask_list_sd; - LLSD info_sd; - sd["layers"] = layer_list_sd; - sd["masks"] = mask_list_sd; - sd["info"] = info_sd; -} - - void LLTexLayerSet::destroyComposite() { if( mComposite ) diff --git a/indra/llappearance/lltexlayer.h b/indra/llappearance/lltexlayer.h index 6a5040cf0b..74b421d3ee 100644 --- a/indra/llappearance/lltexlayer.h +++ b/indra/llappearance/lltexlayer.h @@ -220,8 +220,6 @@ public: static BOOL sHasCaches; - virtual void asLLSD(LLSD& sd) const; - protected: typedef std::vector layer_list_t; layer_list_t mLayerList; -- cgit v1.2.3 From 557fb2cccdb8f267c38f0b2dc88ce939bf1ccc21 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 14 Apr 2022 15:29:05 -0400 Subject: SL-17218: Update faulty test for null LLFace::mTangents --- indra/newview/llface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index f1b64a5899..547d9dad38 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1028,11 +1028,11 @@ void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_po const LLMatrix4& vol_mat = getWorldMatrix(); const LLVolumeFace& vf = getViewerObject()->getVolume()->getVolumeFace(mTEOffset); const LLVector4a& normal4a = vf.mNormals[0]; - const LLVector4a& tangent = vf.mTangents[0]; - if (!&tangent) + if (! vf.mTangents) { return; } + const LLVector4a& tangent = *vf.mTangents; LLVector4a binormal4a; binormal4a.setCross3(normal4a, tangent); -- cgit v1.2.3 From 4e282db26bc0348460f94b7cf8735d385c2896c2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 14 Apr 2022 15:32:19 -0400 Subject: SL-17218: Credit NickyD's contributions to this Jira. --- doc/contributions.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 590c807019..7b57fbbd47 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1107,17 +1107,18 @@ Nicky Dasmijn STORM-1937 OPEN-187 SL-15234 - STORM-2010 + STORM-2010 STORM-2082 MAINT-6665 SL-10291 SL-10293 SL-11061 - SL-11072 + SL-11072 SL-13141 SL-13642 SL-14541 SL-16438 + SL-17218 Nicky Perian OPEN-1 STORM-1087 -- cgit v1.2.3 From b9ed5f9e79799d1b180b9b548c1093d771154d5e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 14 Apr 2022 15:48:09 -0400 Subject: SL-17218: Per NickyD review feedback, test LLFace::mNormals too. --- indra/newview/llface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 547d9dad38..2e32ffca26 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1027,12 +1027,12 @@ void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_po { const LLMatrix4& vol_mat = getWorldMatrix(); const LLVolumeFace& vf = getViewerObject()->getVolume()->getVolumeFace(mTEOffset); - const LLVector4a& normal4a = vf.mNormals[0]; - if (! vf.mTangents) + if (! (vf.mNormals && vf.mTangents)) { return; } - const LLVector4a& tangent = *vf.mTangents; + const LLVector4a& normal4a = *vf.mNormals; + const LLVector4a& tangent = *vf.mTangents; LLVector4a binormal4a; binormal4a.setCross3(normal4a, tangent); -- cgit v1.2.3