diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-08-12 21:33:19 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-08-12 21:33:19 +0000 |
| commit | 8bbf3055dbdab8c3f40cc10b547804e948d76e1f (patch) | |
| tree | 328d3bcc144696a42b6b10054fed390b6824eb14 /indra/llappearance/lldriverparam.cpp | |
| parent | bfc4b9fcf4bb3266e06c2f954854a430cca5075f (diff) | |
| parent | 5937a4222473131d0cec4238fc234646e9aba91e (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #476)
SL-10566, SL-11676, SL-11677
Diffstat (limited to 'indra/llappearance/lldriverparam.cpp')
| -rw-r--r-- | indra/llappearance/lldriverparam.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp index e5e502b158..05d26fbe7a 100644 --- a/indra/llappearance/lldriverparam.cpp +++ b/indra/llappearance/lldriverparam.cpp @@ -614,7 +614,7 @@ void LLDriverParam::setDrivenWeight(LLDrivenEntry *driven, F32 driven_weight) mAvatarAppearance->isValid() && driven->mParam->getCrossWearable()) { - LLWearable* wearable = dynamic_cast<LLWearable*> (mWearablep); + LLWearable* wearable = mWearablep; if (mAvatarAppearance->getWearableData()->isOnTop(wearable)) { use_self = true; |