diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-14 23:46:28 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-14 23:46:28 +0300 |
| commit | f8d5fc6a1fc1f2cca805b3196f0a442a29cfbabe (patch) | |
| tree | 8b009b64588d1ed8f46ba3528592f183f89ad1bb /indra/llappearance | |
| parent | e5cd4da823fe61e57c2d4bb829e39a587276af09 (diff) | |
| parent | b9ed5f9e79799d1b180b9b548c1093d771154d5e (diff) | |
Merge remote-tracking branch 'origin/sl-17218' into DRTVWR-543-maint
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/lltexlayer.cpp | 26 | ||||
| -rw-r--r-- | indra/llappearance/lltexlayer.h | 2 |
2 files changed, 0 insertions, 28 deletions
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index a4600069ce..ca72dd5fd3 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -472,32 +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; - 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; - 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<LLTexLayerInterface *> layer_list_t; layer_list_t mLayerList; |