diff options
| author | callum_linden <none@none> | 2016-07-07 09:13:52 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-07-07 09:13:52 -0700 |
| commit | 067fb126562e586b58c39b9661ca38dc3498d690 (patch) | |
| tree | ee08726e6ac84ffbb1d06d143a8f42515cd297c2 /indra/newview/llviewerinventory.h | |
| parent | d59ce04495be43ab1dc68c1a78b3ca6eb2e7b01e (diff) | |
| parent | f868e29945806fd6cefde65067ae2c870ac112a6 (diff) | |
Automated merge with tip of viewer-release
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, |