diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-09 12:45:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-09 12:45:22 -0400 |
| commit | 5a563069e871ed4f7af6fb4ff121af5dbc00b5bb (patch) | |
| tree | 17ba04b0f2dacfbe9d5e5fa9ddf197c5551eaa83 /indra/newview/llviewerobject.h | |
| parent | 9298b1abe9f8b5a7230a5788e86affb22747740d (diff) | |
| parent | f7f27e4f2617c3656b273117543ecd92ef5ac495 (diff) | |
merge back more late beta fixes from 3.3.4
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index dc102b666f..409108266e 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -432,12 +432,15 @@ public: // manager until we have better iterators. void updateInventory(LLViewerInventoryItem* item, U8 key, bool is_new); void updateInventoryLocal(LLInventoryItem* item, U8 key); // Update without messaging. + void updateTextureInventory(LLViewerInventoryItem* item, U8 key, bool is_new); LLInventoryObject* getInventoryObject(const LLUUID& item_id); void getInventoryContents(LLInventoryObject::object_list_t& objects); LLInventoryObject* getInventoryRoot(); LLViewerInventoryItem* getInventoryItemByAsset(const LLUUID& asset_id); S16 getInventorySerial() const { return mInventorySerialNum; } + bool isTextureInInventory(LLViewerInventoryItem* item); + // These functions does viewer-side only object inventory modifications void updateViewerInventoryAsset( const LLViewerInventoryItem* item, |