summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-08-11 11:54:57 -0400
committerOz Linden <oz@lindenlab.com>2015-08-11 11:54:57 -0400
commit1f23f5a65b3634be39815f853cc008a8b5ad833e (patch)
treeaf5f60fafb3b6af5225136a4effe3025e4ad09a6 /indra/newview/llviewerinventory.h
parent71a468c6fb52f2f2cc7ebd17e548e9eaf3a875a5 (diff)
parent310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff)
merge changes for 3.8.2-release
Diffstat (limited to 'indra/newview/llviewerinventory.h')
-rwxr-xr-xindra/newview/llviewerinventory.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index ca92565600..4e91e4110a 100755
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -228,6 +228,9 @@ public:
void changeType(LLFolderType::EType new_folder_type);
virtual void unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
virtual BOOL unpackMessage(const LLSD& category);
+
+ // returns true if the category object will accept the incoming item
+ bool acceptItem(LLInventoryItem* inv_item);
private:
friend class LLInventoryModel;