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/llcharacter | |
| 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/llcharacter')
| -rw-r--r-- | indra/llcharacter/llvisualparam.cpp | 6 | ||||
| -rw-r--r-- | indra/llcharacter/llvisualparam.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp index e948913a68..c4763c6331 100644 --- a/indra/llcharacter/llvisualparam.cpp +++ b/indra/llcharacter/llvisualparam.cpp @@ -311,3 +311,9 @@ BOOL LLVisualParam::linkDrivenParams(visual_param_mapper mapper, bool only_cross return TRUE; } +//virtual +void LLVisualParam::resetDrivenParams() +{ + // nothing to do for non-driver parameters + return; +} diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h index b2b697766f..e6503d611d 100644 --- a/indra/llcharacter/llvisualparam.h +++ b/indra/llcharacter/llvisualparam.h @@ -120,6 +120,7 @@ public: virtual void stopAnimating(BOOL set_by_user); virtual BOOL linkDrivenParams(visual_param_mapper mapper, bool only_cross_params); + virtual void resetDrivenParams(); // Interface methods S32 getID() const { return mID; } |