diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-07-27 16:46:37 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-07-27 16:46:37 +0300 |
| commit | a4fcfb153049c5db68891a73c715ae57ebcb0464 (patch) | |
| tree | dbbd8aba567b6daeb1eecb7264a49fbd8bf531d8 /indra/newview/lloutfitslist.h | |
| parent | c8316be258cdf9252c2d1bec0f223bc4245ff205 (diff) | |
| parent | 092d49cb3a0ca090ffd792661c9cf335fec4c5c6 (diff) | |
Merge with head.
Resolved conflict in indra/newview/lloutfitslist.cpp to use changes from viewer-release.
Rejected changes in that file coming with 10f02c59761c (EXT-7015 FIXED Avoided wearing item moved to trash.) It will be refixed in a separate commit.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lloutfitslist.h')
| -rw-r--r-- | indra/newview/lloutfitslist.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h index 206854b232..af094c28d4 100644 --- a/indra/newview/lloutfitslist.h +++ b/indra/newview/lloutfitslist.h @@ -105,6 +105,11 @@ public: void getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const; + /** + * Returns true in case any of selected item is in trash. + */ + bool isSelectedInTrash(); + boost::signals2::connection setSelectionChangeCallback(selection_change_callback_t cb); // Collects selected items from all selected lists and wears them(if possible- adds, else replaces) |