diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-07-26 17:49:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-07-26 17:49:41 -0400 |
| commit | 47f2c6bd52a9e929af8ccefa08d11ad18f05602b (patch) | |
| tree | 77d601c23539f576807f3e2cd8a62603b275905d /indra/newview/llviewerinventory.h | |
| parent | bea18c933bd97b838644f0d1738c633495b6b102 (diff) | |
| parent | 19640c015ecfefde767be49168684b27f5ceabb2 (diff) | |
merge callums latest changes
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rw-r--r-- | indra/newview/llviewerinventory.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 4e91e4110a..5194679a0c 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -38,6 +38,7 @@ class LLInventoryPanel; class LLFolderView; class LLFolderBridge; class LLViewerInventoryCategory; +class LLInventoryCallback; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLViewerInventoryItem @@ -387,9 +388,9 @@ void update_inventory_item( LLPointer<LLInventoryCallback> cb); void update_inventory_category( - const LLUUID& cat_id, - const LLSD& updates, - LLPointer<LLInventoryCallback> cb); + const LLUUID& cat_id, + const LLSD& updates, + LLPointer<LLInventoryCallback> cb); void remove_inventory_items( LLInventoryObject::object_list_t& items, |