diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-30 17:47:16 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-30 17:47:16 -0400 |
| commit | d99a7d2f1d5d839131919d17173f5197c04083a6 (patch) | |
| tree | 85e9c0fe489c01ab69d0d1da6be6c6bfcb6710a4 /indra/newview/llinventorybridge.cpp | |
| parent | 2e05cc588f1ba2a5977d4d9c66c5d82c163fa156 (diff) | |
| parent | 98695056c2fbfb91de805d9e2a01cde23668c4d3 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index e7c51aa2a8..1b6fa6dd9a 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4905,9 +4905,9 @@ void LLWearableBridge::onRemoveFromAvatarArrived(LLWearable* wearable, if( !(type==WT_SHAPE || type==WT_SKIN || type==WT_HAIR || type==WT_EYES ) ) //&& //!((!gAgent.isTeen()) && ( type==WT_UNDERPANTS || type==WT_UNDERSHIRT )) ) { - // MULTI_WEARABLE: FIXME HACK - always remove all bool do_remove_all = false; - gAgentWearables.removeWearable( type, do_remove_all, 0 ); + U32 index = gAgentWearables.getWearableIndex(wearable); + gAgentWearables.removeWearable( type, do_remove_all, index ); } } } |