diff options
author | Don Kjer <don@lindenlab.com> | 2012-10-17 23:12:52 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-10-17 23:12:52 +0000 |
commit | a32dbd314809e7d0093745f0bbcb3628320f8c5e (patch) | |
tree | f08973b9250835a7ef6fa61a90dfb43a2a30e183 /indra/llappearance/lldriverparam.cpp | |
parent | 98e2488f6fd64eb428fcc8f659cb7f0d82196449 (diff) | |
parent | 2390e21a9d2fc6f5cabe132a2bbd807aec186cfa (diff) |
automated merge
Diffstat (limited to 'indra/llappearance/lldriverparam.cpp')
-rwxr-xr-x | indra/llappearance/lldriverparam.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp index 2d91ebdee9..01184a9e23 100755 --- a/indra/llappearance/lldriverparam.cpp +++ b/indra/llappearance/lldriverparam.cpp @@ -481,6 +481,7 @@ BOOL LLDriverParam::linkDrivenParams(visual_param_mapper mapper, BOOL only_cross if (!found) { LLViewerVisualParam* param = (LLViewerVisualParam*)mapper(driven_id); + if (param) param->setParamLocation(this->getParamLocation()); bool push = param && (!only_cross_params || param->getCrossWearable()); if (push) { |