Reintroduce llappearanceutility to viewer tree from archive/develop

Signed-off-by: Rye <rye@alchemyviewer.org>

5 files changed, 32 insertions, 4 deletions

diff --git a/indra/llappearance/llavatarappearancedefines.cpp b/indra/llappearance/llavatarappearancedefines.cpp
index 47798844bc..f26795123f 100644
--- a/indra/llappearance/llavatarappearancedefines.cpp
+++ b/indra/llappearance/llavatarappearancedefines.cpp
@@ -260,7 +260,7 @@ ETextureIndex LLAvatarAppearanceDictionary::bakedToLocalTextureIndex(EBakedTextu
     return getBakedTexture(index)->mTextureIndex;
 }
 
-EBakedTextureIndex LLAvatarAppearanceDictionary::findBakedByRegionName(std::string name)
+EBakedTextureIndex LLAvatarAppearanceDictionary::findBakedByRegionName(const std::string& name) const
 {
     U8 index = 0;
     while (index < BAKED_NUM_INDICES)
@@ -277,7 +277,7 @@ EBakedTextureIndex LLAvatarAppearanceDictionary::findBakedByRegionName(std::stri
     return BAKED_NUM_INDICES;
 }
 
-EBakedTextureIndex LLAvatarAppearanceDictionary::findBakedByImageName(std::string name)
+EBakedTextureIndex LLAvatarAppearanceDictionary::findBakedByImageName(const std::string& name) const
 {
     U8 index = 0;
     while (index < BAKED_NUM_INDICES)
diff --git a/indra/llappearance/llavatarappearancedefines.h b/indra/llappearance/llavatarappearancedefines.h
index 50a72a45a5..0f9edc1ca0 100644
--- a/indra/llappearance/llavatarappearancedefines.h
+++ b/indra/llappearance/llavatarappearancedefines.h
@@ -238,8 +238,8 @@ public:
     ETextureIndex       bakedToLocalTextureIndex(EBakedTextureIndex t) const;
 
     // find a baked texture index based on its name
-    EBakedTextureIndex  findBakedByRegionName(std::string name);
-    EBakedTextureIndex  findBakedByImageName(std::string name);
+    EBakedTextureIndex  findBakedByRegionName(const std::string& name) const;
+    EBakedTextureIndex  findBakedByImageName(const std::string& name) const;
 
     // Given a texture entry, determine which wearable type owns it.
     LLWearableType::EType       getTEWearableType(ETextureIndex index) const;
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index b3800e6981..389efe47a9 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -435,6 +435,31 @@ 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 876ea6f600..6b501474d6 100644
--- a/indra/llappearance/lltexlayer.h
+++ b/indra/llappearance/lltexlayer.h
@@ -220,6 +220,8 @@ public:
 
     static bool                 sHasCaches;
 
+    virtual void                asLLSD(LLSD& sd) const;
+
 protected:
     typedef std::vector<LLTexLayerInterface *> layer_list_t;
     layer_list_t                mLayerList;
diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h
index 5e785e4f3e..116eb3bee0 100644
--- a/indra/llappearance/lltexlayerparams.h
+++ b/indra/llappearance/lltexlayerparams.h
@@ -30,6 +30,7 @@
 #include "llpointer.h"
 #include "v4color.h"
 #include "llviewervisualparam.h"
+#include <atomic>
 
 class LLAvatarAppearance;
 class LLImageRaw;