Merge branch 'develop' into marchcat/b-develop

# Conflicts:
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvoicewebrtc.cpp

3 files changed, 28 insertions, 24 deletions

diff --git a/indra/llappearance/llavatarappearancedefines.cpp b/indra/llappearance/llavatarappearancedefines.cpp
index 580e6433c5..5f98f2c8c1 100644
--- a/indra/llappearance/llavatarappearancedefines.cpp
+++ b/indra/llappearance/llavatarappearancedefines.cpp
@@ -28,8 +28,8 @@
 #include "llavatarappearancedefines.h"
 #include "indra_constants.h"
 
-const S32 LLAvatarAppearanceDefines::SCRATCH_TEX_WIDTH = 1024;
-const S32 LLAvatarAppearanceDefines::SCRATCH_TEX_HEIGHT = 1024;
+const S32 LLAvatarAppearanceDefines::SCRATCH_TEX_WIDTH = 2048;
+const S32 LLAvatarAppearanceDefines::SCRATCH_TEX_HEIGHT = 2048;
 
 using namespace LLAvatarAppearanceDefines;
 
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp
index a7e5292fed..ae038e09cc 100644
--- a/indra/llappearance/llwearable.cpp
+++ b/indra/llappearance/llwearable.cpp
@@ -645,9 +645,10 @@ void LLWearable::addVisualParam(LLVisualParam *param)
 
 void LLWearable::setVisualParamWeight(S32 param_index, F32 value)
 {
-    if( is_in_map(mVisualParamIndexMap, param_index ) )
+    visual_param_index_map_t::iterator found = mVisualParamIndexMap.find(param_index);
+    if (found != mVisualParamIndexMap.end())
     {
-        LLVisualParam *wearable_param = mVisualParamIndexMap[param_index];
+        LLVisualParam *wearable_param = found->second;
         wearable_param->setWeight(value);
     }
     else
@@ -658,9 +659,10 @@ void LLWearable::setVisualParamWeight(S32 param_index, F32 value)
 
 F32 LLWearable::getVisualParamWeight(S32 param_index) const
 {
-    if( is_in_map(mVisualParamIndexMap, param_index ) )
+    visual_param_index_map_t::const_iterator found = mVisualParamIndexMap.find(param_index);
+    if(found != mVisualParamIndexMap.end())
     {
-        const LLVisualParam *wearable_param = mVisualParamIndexMap.find(param_index)->second;
+        const LLVisualParam *wearable_param = found->second;
         return wearable_param->getWeight();
     }
     else
@@ -733,9 +735,9 @@ void LLWearable::writeToAvatar(LLAvatarAppearance* avatarp)
         if( (((LLViewerVisualParam*)param)->getWearableType() == mType) && (!((LLViewerVisualParam*)param)->getCrossWearable()) )
         {
             S32 param_id = param->getID();
+            // get weight from wearable and write back into character
             F32 weight = getVisualParamWeight(param_id);
-
-            avatarp->setVisualParamWeight( param_id, weight);
+            param->setWeight(weight);
         }
     }
 }
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp
index 7598ed67f3..f3b76da224 100644
--- a/indra/llappearance/llwearabledata.cpp
+++ b/indra/llappearance/llwearabledata.cpp
@@ -286,43 +286,45 @@ const LLWearable* LLWearableData::getWearable(const LLWearableType::EType type,
 
 LLWearable* LLWearableData::getTopWearable(const LLWearableType::EType type)
 {
-    U32 count = getWearableCount(type);
-    if ( count == 0)
+    wearableentry_map_t::const_iterator wearable_iter = mWearableDatas.find(type);
+    if (wearable_iter == mWearableDatas.end())
     {
         return NULL;
     }
+    const wearableentry_vec_t& wearable_vec = wearable_iter->second;
 
-    return getWearable(type, count-1);
+    size_t size = wearable_vec.size();
+    if (size == 0)
+    {
+        return NULL;
+    }
+    return wearable_vec[size - 1];
 }
 
 const LLWearable* LLWearableData::getTopWearable(const LLWearableType::EType type) const
 {
-    U32 count = getWearableCount(type);
-    if ( count == 0)
+    wearableentry_map_t::const_iterator wearable_iter = mWearableDatas.find(type);
+    if (wearable_iter == mWearableDatas.end())
     {
         return NULL;
     }
+    const wearableentry_vec_t& wearable_vec = wearable_iter->second;
 
-    return getWearable(type, count-1);
-}
-
-LLWearable* LLWearableData::getBottomWearable(const LLWearableType::EType type)
-{
-    if (getWearableCount(type) == 0)
+    size_t size = wearable_vec.size();
+    if (size == 0)
     {
         return NULL;
     }
+    return wearable_vec[size - 1];
+}
 
+LLWearable* LLWearableData::getBottomWearable(const LLWearableType::EType type)
+{
     return getWearable(type, 0);
 }
 
 const LLWearable* LLWearableData::getBottomWearable(const LLWearableType::EType type) const
 {
-    if (getWearableCount(type) == 0)
-    {
-        return NULL;
-    }
-
     return getWearable(type, 0);
 }