Merge pull request #6193 from secondlife/release/26.4

Release/26.4

1 files changed, 36 insertions, 0 deletions

diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 19e4e8ed9d..45f3e8dcd2 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 )
@@ -1405,6 +1430,15 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
                 // We should only be doing this when we believe something has changed with respect to the user's appearance.
         {
             LL_DEBUGS("Morph") << "gl alpha cache of morph mask not found, doing readback: " << getName() << LL_ENDL;
+
+            // Replace the cached mask without leaking its old allocation.
+            alpha_cache_t::iterator cached = mAlphaCache.find(cache_index);
+            if (cached != mAlphaCache.end())
+            {
+                ll_aligned_free_32(cached->second);
+                mAlphaCache.erase(cached);
+            }
+
             // clear out a slot if we have filled our cache
             S32 max_cache_entries = getTexLayerSet()->getAvatarAppearance()->isSelf() ? 4 : 1;
             while ((S32)mAlphaCache.size() >= max_cache_entries)
@@ -1441,6 +1475,7 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
                     U8* temp = (U8*)ll_aligned_malloc_32(mem_size << 2); // allocate same size, but RGBA
                     if (!temp)
                     {
+                        ll_aligned_free_32(alpha_data);
                         LLError::LLUserWarningMsg::showOutOfMemory();
                         LL_ERRS() << "Failed to allocate temporary memory for morph texture readback: " << (S32)(mem_size << 2) << LL_ENDL;
                         return;
@@ -1483,6 +1518,7 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
                     U8* temp_data = (U8*)ll_aligned_malloc_32(mem_size * TEMP_BYTES_PER_PIXEL);
                     if (!temp_data)
                     {
+                        ll_aligned_free_32(alpha_data);
                         LLError::LLUserWarningMsg::showOutOfMemory();
                         LL_ERRS() << "Failed to allocate temporary memory for morph texture: " << (S32)(mem_size * TEMP_BYTES_PER_PIXEL) << LL_ENDL;
                         return;