diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 15:20:37 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 15:20:37 -0400 |
| commit | cc3f4c1f59f38a6a5caead4cbd53ddc4d94217ef (patch) | |
| tree | 24538502384c162c504bd516282e13e30e3b8974 /indra/newview/llinventorybridge.cpp | |
| parent | b15e34b94207c52d81e310f962e72f4d8030bd94 (diff) | |
| parent | dbcd12a4d14412de6850fbf89dfe58b1f799222d (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
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 899a70303b..604af3d074 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4947,9 +4947,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 ); } } } |