diff options
| author | callum <none@none> | 2012-07-06 11:31:37 -0700 |
|---|---|---|
| committer | callum <none@none> | 2012-07-06 11:31:37 -0700 |
| commit | 51f740ca8d0e947d8fde38cb353bdf753cd224fa (patch) | |
| tree | c394a60e01d076e01cb60f9c84f9dafdf6f7d82c /indra/newview/llviewerobject.h | |
| parent | 11686a0917c7e6e67920aca46ade4624c5027c0e (diff) | |
MAINT-1228 FIX Can not put more than one object into the contents of an object
Reviewed by Paul PE
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, |