diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-02 20:13:02 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-02 20:13:02 +0100 |
| commit | 226da5dd808941ec7dd8c951f8ed8065e7ff3041 (patch) | |
| tree | 4b7142be7fa3e75078e2b4c76654684c2db4410f /indra/newview | |
| parent | 9354571174af49849b56b5cc2a81c8d65f59cdfe (diff) | |
EXT-7499 FIXED Prevent other avatars from remaining with a ruth shape
EXT-7598 FIXED dup - Consistent 'ruthing' of male avatars at meeting
final piece. all reviewed by nyx.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 44532af5f7..8456d13931 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6699,14 +6699,13 @@ bool LLVOAvatar::visualParamWeightsAreDefault() { if (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) { + LLViewerVisualParam* vparam = dynamic_cast<LLViewerVisualParam*>(param); + llassert(vparam); + bool is_skirt_param = vparam && + LLWearableType::WT_SKIRT == vparam->getWearableType(); if (param->getWeight() != param->getDefaultWeight() && // we have to not care whether skirt weights are default, if we're not actually wearing a skirt - (is_wearing_skirt || - (param->getName() != "skirt length" && - param->getName() != "slit front" && - param->getName() != "slit back" && - param->getName() != "slit left" && - param->getName() != "slit right"))) + (is_wearing_skirt || !is_skirt_param)) { //llinfos << "param '" << param->getName() << "'=" << param->getWeight() << " which differs from default=" << param->getDefaultWeight() << llendl; rtn = false; @@ -6792,13 +6791,13 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) // parse visual params S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_VisualParam); - bool drop_visual_params_debug = gSavedSettings.getBOOL("BlockSomeAvatarAppearanceVisualParams") && (random()%2)!=0; // pretend that ~50% of AvatarAppearance messages arrived without a VisualParam block, for testing + bool drop_visual_params_debug = gSavedSettings.getBOOL("BlockSomeAvatarAppearanceVisualParams") && (random()%2)==0; // pretend that ~12% of AvatarAppearance messages arrived without a VisualParam block, for testing if( num_blocks > 1 && !drop_visual_params_debug) { BOOL params_changed = FALSE; BOOL interp_params = FALSE; - LLVisualParam* param = getFirstVisualParam(); // why do we peel away and ignore the first VisualParam? + LLVisualParam* param = getFirstVisualParam(); llassert(param); // if this ever fires, we should do the same as when num_blocks<=1 if (!param) { @@ -6844,7 +6843,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) const S32 expected_tweakable_count = getVisualParamCountInGroup(VISUAL_PARAM_GROUP_TWEAKABLE); if (num_blocks != expected_tweakable_count) { - llwarns << "Number of params in AvatarAppearance msg (" << num_blocks << ") does not match number of tweakable params in avatar xml file (" << expected_tweakable_count << "). Processing what we can. object: " << getID() << llendl; + llinfos << "Number of params in AvatarAppearance msg (" << num_blocks << ") does not match number of tweakable params in avatar xml file (" << expected_tweakable_count << "). Processing what we can. object: " << getID() << llendl; } if (params_changed) |