diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-09 11:41:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-09 11:41:47 -0400 |
| commit | 690f985a9c3dba6f08bf955bf0c11c256a2b42bf (patch) | |
| tree | 13a44cc63d1ffc19e5bedd62632c1559b21b0bb8 /indra/newview/llviewerobject.h | |
| parent | 13f7afbd7d91db0ab5b2f1e3bf7b894bbdd48e7a (diff) | |
| parent | 1b109f80b92a6b113d4874527d49d51cc451b302 (diff) | |
merge changes for DRTVWR-177
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, |