summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.h
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2015-08-04 16:45:49 +0300
committerandreykproductengine <akleshchev@productengine.com>2015-08-04 16:45:49 +0300
commitf94a19e09ebcf51e3e6cd3437fe364b60755406f (patch)
treefa4f585008c6f5aa7850b2f5128a681b0065fcdc /indra/newview/llviewerinventory.h
parentd04a3b6d4e67dafa0b6dd8e88b752c5a929de5b0 (diff)
parent310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff)
Merge downstream code and become version 3.8.3
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;