diff options
| author | Richard Linden <none@none> | 2012-02-23 12:40:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-23 12:40:27 -0800 |
| commit | f4a122b6d72bdc2dc482fb04475703ffa5a00219 (patch) | |
| tree | 0155d0d080b42740666564ed9f02b9d33069a4e5 /indra/newview/llinventorybridge.h | |
| parent | a5e4b15b7d29a64781eb32ef71e557a5bb8dc870 (diff) | |
| parent | 48bc2a7c9f6175a5c3179f6fccc98c3d3c50a4c9 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 3bcd71557c..3b4f845f54 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -35,6 +35,7 @@ #include "llviewercontrol.h" #include "llwearable.h" +class LLInventoryFilter; class LLInventoryPanel; class LLInventoryModel; class LLMenuGL; @@ -645,7 +646,8 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id, const LLUUID& category_id, BOOL drop, void (*callback)(S32, void*) = NULL, - void* user_data = NULL); + void* user_data = NULL, + LLInventoryFilter* filter = NULL); // Utility function to hide all entries except those in the list // Can be called multiple times on the same menu (e.g. if multiple items |