Update: Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers v6->v9

issue tattoo tinting does not work

1 files changed, 7 insertions, 7 deletions

diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index b74ef02..f8123bb 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -535,7 +535,7 @@ BOOL LLWearable::isOldVersion()
                 param;
                 param = (LLViewerVisualParam*) avatar->getNextVisualParam() )
         {
-                if( (param->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (param->getWearableType() == mType && param->isTweakable())
                 {
                         param_count++;
                         if( !is_in_map(mVisualParamMap, param->getID() ) )
@@ -591,7 +591,7 @@ BOOL LLWearable::isDirty()
                 param;
                 param = (LLViewerVisualParam*) avatar->getNextVisualParam() )
         {
-                if( (param->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (param->getWearableType() == mType && param->isTweakable())
                 {
                         F32 weight = get_if_there(mVisualParamMap, param->getID(), param->getDefaultWeight());
                         weight = llclamp( weight, param->getMinWeight(), param->getMaxWeight() );
@@ -690,7 +690,7 @@ void LLWearable::setParamsToDefaults()
         mVisualParamMap.clear();
         for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
         {
-                if( (((LLViewerVisualParam*)param)->getWearableType() == mType ) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (((LLViewerVisualParam*)param)->getWearableType() == mType && param->isTweakable())
                 {
                         mVisualParamMap[param->getID()] = param->getDefaultWeight();
                 }
@@ -724,7 +724,7 @@ void LLWearable::writeToAvatar( BOOL set_by_user )
         // Pull params
         for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
         {
-                if( (((LLViewerVisualParam*)param)->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (((LLViewerVisualParam*)param)->getWearableType() == mType && param->isTweakable())
                 {
                         S32 param_id = param->getID();
                         F32 weight = get_if_there(mVisualParamMap, param_id, param->getDefaultWeight());
@@ -825,7 +825,7 @@ void LLWearable::removeFromAvatar( EWearableType type, BOOL set_by_user )
         // Pull params
         for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
         {
-                if( (((LLViewerVisualParam*)param)->getWearableType() == type) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (((LLViewerVisualParam*)param)->getWearableType() == type && param->isTweakable())
                 {
                         S32 param_id = param->getID();
                         avatar->setVisualParamWeight( param_id, param->getDefaultWeight(), set_by_user );
@@ -873,7 +873,7 @@ void LLWearable::readFromAvatar()
         mVisualParamMap.clear();
         for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
         {
-                if( (((LLViewerVisualParam*)param)->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (((LLViewerVisualParam*)param)->getWearableType() == mType && param->isTweakable())
                 {
                         
                         //pretty sure is right
@@ -938,7 +938,7 @@ void LLWearable::copyDataFrom( LLWearable* src )
                 param;
                 param = (LLViewerVisualParam*) avatar->getNextVisualParam() )
         {
-                if( (param->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (param->getWearableType() == mType && param->isTweakable())
                 {
                         S32 id = param->getID();
                         F32 weight = get_if_there(src->mVisualParamMap, id, param->getDefaultWeight() );