summaryrefslogtreecommitdiff
path: root/indra/llappearance/lldriverparam.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2012-11-15 15:20:46 -0500
committerLogan Dethrow <log@lindenlab.com>2012-11-15 15:20:46 -0500
commit79dbaed1581a5d8212caebf6b6a3672660e2f5a9 (patch)
treec3c539a8ce3ccfb4d7d1a66b58b56fce9b5c293b /indra/llappearance/lldriverparam.cpp
parentf93604c399c889e06980554e1cb59a833e7f847d (diff)
parent51a016a0cc6928dd2a685ce22dd6475e2610a5c5 (diff)
Merge lindenlab/sunshine-internal -> log/sunshine-internal
Diffstat (limited to 'indra/llappearance/lldriverparam.cpp')
-rwxr-xr-xindra/llappearance/lldriverparam.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp
index 01184a9e23..1f7e8b8652 100755
--- a/indra/llappearance/lldriverparam.cpp
+++ b/indra/llappearance/lldriverparam.cpp
@@ -190,6 +190,7 @@ BOOL LLDriverParam::setInfo(LLDriverParamInfo *info)
// FIXME DRANO this clobbers mWearablep, which means any code
// currently using mWearablep is wrong, or at least untested.
*new_param = *this;
+ //new_param->mWearablep = wearable;
// new_param->mDriven.clear(); // clear driven list to avoid overwriting avatar driven params from wearables.
return new_param;
}