diff options
| author | Neal Orman <nyx@lindenlab.com> | 2009-10-19 18:23:19 +0000 |
|---|---|---|
| committer | Neal Orman <nyx@lindenlab.com> | 2009-10-19 18:23:19 +0000 |
| commit | 0d6f1d125eb0f6de766d617978a022fc74b4aec7 (patch) | |
| tree | 0b01c99ef836708a55c51c435e3e681a30a59ba7 /indra/newview/llwearable.cpp | |
| parent | a606e7be9bb5cae91d969826a00df1985ee32f15 (diff) | |
EXT-1664 bugfix for male avatars have female bodies
Found a couple bugs in the code relating to cross-wearable visual param linking.
Fixed with this patch - cross-wearable and inter-wearable visual params should
now link properly for both wearable-owned and avatar-owned parameters.
Code reviewed by Seraph
Diffstat (limited to 'indra/newview/llwearable.cpp')
| -rw-r--r-- | indra/newview/llwearable.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index 1675ee1adc..09e8c522b0 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -194,11 +194,12 @@ void LLWearable::createVisualParams() LLVisualParam*(LLWearable::*wearable_function)(S32)const = &LLWearable::getVisualParam; // need this line to disambiguate between versions of LLCharacter::getVisualParam() LLVisualParam*(LLVOAvatarSelf::*avatar_function)(S32)const = &LLVOAvatarSelf::getVisualParam; + param->resetDrivenParams(); if(!param->linkDrivenParams(boost::bind(wearable_function,(LLWearable*)this, _1), false)) { if( !param->linkDrivenParams(boost::bind(avatar_function,(LLVOAvatarSelf*)avatar,_1 ), true)) { - llwarns << "could not link driven params for wearable " << getName() << llendl; + llwarns << "could not link driven params for wearable " << getName() << " id: " << param->getID() << llendl; continue; } } |