diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-05-08 10:18:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-05-08 10:18:03 -0700 |
| commit | 60f602d5e12a50623b51b13e097992f79006823f (patch) | |
| tree | 386e3cf5b25f3292e3ba7c8a9b0524c5bfbb9589 /indra/newview/llinventorybridge.h | |
| parent | 29da931051202a10ea71db56e47acecae1603a5d (diff) | |
| parent | ccb86a2a6675b21dda6267d4a850e5a09acbafa4 (diff) | |
Pull from VirLinden/drano
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 871657a58a..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; @@ -161,7 +162,7 @@ protected: BOOL restamp); void removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*>& batch); protected: - LLHandle<LLPanel> mInventoryPanel; + LLHandle<LLInventoryPanel> mInventoryPanel; LLFolderView* mRoot; const LLUUID mUUID; // item id LLInventoryType::EType mInvType; @@ -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 |