diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-27 22:01:40 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-27 22:01:40 +0000 |
| commit | 793dde16f371408948474d31f9275ea4031b65aa (patch) | |
| tree | 57d46ee9729c2b1888634ce080ce04d4cc2607f3 /indra/llappearance/lldriverparam.cpp | |
| parent | 4f93192e7d00f1f03e0e5241e9f1d2f31623729c (diff) | |
| parent | 352698140775e62498686f80b5aa21aee85524cf (diff) | |
Merge sunshine-internal -> sunshine-experimental
Diffstat (limited to 'indra/llappearance/lldriverparam.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llappearance/lldriverparam.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp index 1092b525d0..2d91ebdee9 100644..100755 --- a/indra/llappearance/lldriverparam.cpp +++ b/indra/llappearance/lldriverparam.cpp @@ -187,7 +187,10 @@ BOOL LLDriverParam::setInfo(LLDriverParamInfo *info) { llassert(wearable); LLDriverParam *new_param = new LLDriverParam(mAvatarAppearance, wearable); + // FIXME DRANO this clobbers mWearablep, which means any code + // currently using mWearablep is wrong, or at least untested. *new_param = *this; +// new_param->mDriven.clear(); // clear driven list to avoid overwriting avatar driven params from wearables. return new_param; } |