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(-) (limited to 'indra/llappearance') 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(-) (limited to 'indra/llappearance') 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