1 files changed, 103 insertions, 19 deletions

diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index bf5fd4a..087c74c 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -152,38 +152,34 @@ EWearableType LLWearable::typeNameToType( const std::string& type_name )
         }
         return WT_INVALID;
 }
-
-const char* terse_F32_to_string( F32 f, char s[MAX_STRING] )            /* Flawfinder: ignore */
+std::string terse_F32_to_string( F32 f )
 {
-        char* r = s;
-        S32 len = snprintf( s, MAX_STRING, "%.2f", f );         /* Flawfinder: ignore */
-
+        std::string r = llformat( "%.2f", f );
         // "1.20"  -> "1.2"
         // "24.00" -> "24."
-        while( '0' == r[len - 1] )
+        S32 len = r.length();
+        while( len > 0 && '0' == r[len - 1] )
         {
-                len--;  
-                r[len] = '\0';
+                r.erase(len-1, 1);
+                len--;
         }
 
         if( '.' == r[len - 1] )
         {
                 // "24." -> "24"
-                len--;
-                r[len] = '\0';
+                r.erase(len-1, 1);
         }
         else
         if( ('-' == r[0]) && ('0' == r[1]) )
         {
                 // "-0.59" -> "-.59"
-                r++;
-                r[0] = '-';
+                r.erase(1, 1);
         }
         else
         if( '0' == r[0] )
         {
                 // "0.59" -> ".59"
-                r++;
+                r.erase(0, 1);
         }
 
         return r;
@@ -200,13 +196,12 @@ BOOL LLWearable::FileExportParams( FILE* file )
         S32 num_parameters = mVisualParamMap.size();
         fprintf( file, "parameters %d\n", num_parameters );
 
-        char s[ MAX_STRING ];           /* Flawfinder: ignore */
         for (param_map_t::iterator iter = mVisualParamMap.begin();
                  iter != mVisualParamMap.end(); ++iter)
         {
                 S32 param_id = iter->first;
                 F32 param_weight = iter->second;
-                fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight, s ) );
+                fprintf( file, "%d %s\n", param_id, terse_F32_to_string(param_weight).c_str() );
         }
 
         return TRUE;
@@ -280,13 +275,12 @@ BOOL LLWearable::exportFile( LLFILE* file )
                 return FALSE;
         }
 
-        char s[ MAX_STRING ];           /* Flawfinder: ignore */
         for (param_map_t::iterator iter = mVisualParamMap.begin();
                  iter != mVisualParamMap.end(); ++iter)
         {
                 S32 param_id = iter->first;
                 F32 param_weight = iter->second;
-                if( fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight, s ) ) < 0 )
+                if( fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight ).c_str() ) < 0 )
                 {
                         return FALSE;
                 }
@@ -597,9 +591,52 @@ BOOL LLWearable::isDirty()
                         weight = llclamp( weight, param->getMinWeight(), param->getMaxWeight() );
                         
                         U8 a = F32_to_U8( param->getWeight(), param->getMinWeight(), param->getMaxWeight() );
-                        U8 b = F32_to_U8( weight,             param->getMinWeight(), param->getMaxWeight() );
+
+                        if(avatar->getAppearanceFlag() == true)
+                        {
+                                //boob
+                                if(param->getID() == 507)
+                                {
+                                                weight = get_if_there(mVisualParamMap, param->getID(), avatar->getActualBoobGrav());
+                                                weight = llclamp( weight, param->getMinWeight(), param->getMaxWeight() );
+                                }
+                                //butt
+                                if(param->getID() == 795)
+                                {
+                                                weight = get_if_there(mVisualParamMap, param->getID(), avatar->getActualButtGrav());
+                                                weight = llclamp( weight, param->getMinWeight(), param->getMaxWeight() );
+                                }
+                                //fat
+                                if(param->getID() == 157)
+                                {
+                                                weight = get_if_there(mVisualParamMap, param->getID(), avatar->getActualFatGrav());
+                                                weight = llclamp( weight, param->getMinWeight(), param->getMaxWeight() );
+                                }
+                        }
+                        else
+                        {
+                                //boob
+                                if(param->getID() == 507)
+                                {
+                                                a = F32_to_U8( avatar->getActualBoobGrav(), param->getMinWeight(), param->getMaxWeight() );
+                                }
+                                //butt
+                                if(param->getID() == 795)
+                                {
+                                                a = F32_to_U8( avatar->getActualButtGrav(), param->getMinWeight(), param->getMaxWeight() );
+                                }
+                                //fat
+                                if(param->getID() == 157)
+                                {
+                                                a = F32_to_U8( avatar->getActualFatGrav(), param->getMinWeight(), param->getMaxWeight() );
+                                }
+                        }
+
+                        
+                        U8 b = F32_to_U8( weight, param->getMinWeight(), param->getMaxWeight() );
                         if( a != b  )
                         {
+                                llwarns << "param ID " << param->getID() << " was changed." << llendl;
                                 return TRUE;
                         }
                 }
@@ -685,6 +722,16 @@ void LLWearable::writeToAvatar( BOOL set_by_user )
                 {
                         S32 param_id = param->getID();
                         F32 weight = get_if_there(mVisualParamMap, param_id, param->getDefaultWeight());
+
+                        //ZOMG: When switching shapes from inventory
+                        if(param_id == 507)
+                                avatar->setActualBoobGrav(weight);
+                        if(param_id == 795)
+                                avatar->setActualButtGrav(weight);
+                        if(param_id == 157)
+                                avatar->setActualFatGrav(weight);
+                                
+
                         // only animate with user-originated changes
                         if (set_by_user)
                         {
@@ -745,7 +792,7 @@ void LLWearable::writeToAvatar( BOOL set_by_user )
 
 //      if( set_by_user )
 //      {
-//              gAgent.sendAgentSetAppearance();
+                gAgent.sendAgentSetAppearance();
 //      }
 }
 
@@ -822,6 +869,22 @@ void LLWearable::readFromAvatar()
         {
                 if( (((LLViewerVisualParam*)param)->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
                 {
+                        
+                        //pretty sure is right
+                        if(param->getID() == 507)
+                                avatar->setActualBoobGrav(param->getWeight());
+                        if(param->getID() == 151)
+                                avatar->setActualButtGrav(param->getWeight());
+                        if(param->getID() == 157)
+                                avatar->setActualFatGrav(param->getWeight());
+                        
+                        //if(param->getID() == 507)
+                        //{
+                        //      llwarns << "current = " << avatar->getActualBoobGrav() << llendl;
+                        //      llwarns << "param weight = " << param->getWeight() << llendl;
+                        //}
+                                
+
                         mVisualParamMap[param->getID()] = param->getWeight();
                 }
         }
@@ -873,6 +936,27 @@ void LLWearable::copyDataFrom( LLWearable* src )
                 {
                         S32 id = param->getID();
                         F32 weight = get_if_there(src->mVisualParamMap, id, param->getDefaultWeight() );
+                        //llwarns << "------------------------------" << llendl;
+                        //llwarns << "copydatafrom" << llendl;
+                        //llwarns << "------------------------------" << llendl;
+                        
+                        //if(id == 507)
+                        //{
+                        //      llwarns << "weight = " << weight << llendl;
+                        //      llwarns << "actual = " << avatar->getActualBoobGrav() << llendl;
+                        //      llwarns << "mVisualParamMap[id] = " << mVisualParamMap[id] << llendl;
+                        //}
+
+                        //pretty sure right
+                        if(id == 507)
+                                avatar->setActualBoobGrav(weight);
+                        if(id == 795)
+                                avatar->setActualButtGrav(weight);
+                        if(id == 157)
+                                avatar->setActualFatGrav(weight);
+                        
+                        
+
                         mVisualParamMap[id] = weight;
                 }
         }