diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-10-31 22:16:27 +0200 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-10-31 23:18:11 +0200 |
| commit | 40e568a3180f641fe0feb0e6ddd696c07ed662be (patch) | |
| tree | e18ac9b8f7f97e4533556ef79528f36492bd44c1 /indra/newview/llviewerobject.h | |
| parent | f72309a17eab1be1979c58a135e061ebffc37e21 (diff) | |
SL-20549 Blank no-copy materials are not moved into scripted objects
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 898b21e1ae..ec7bf36f71 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -500,6 +500,7 @@ public: void getInventoryContents(LLInventoryObject::object_list_t& objects); LLInventoryObject* getInventoryRoot(); LLViewerInventoryItem* getInventoryItemByAsset(const LLUUID& asset_id); + LLViewerInventoryItem* getInventoryItemByAsset(const LLUUID& asset_id, LLAssetType::EType type); S16 getInventorySerial() const { return mInventorySerialNum; } // These functions does viewer-side only object inventory modifications @@ -639,7 +640,7 @@ public: private: void setObjectCostStale(); - bool isAssetInInventory(LLViewerInventoryItem* item); + bool isAssetInInventory(LLViewerInventoryItem* item, LLAssetType::EType type); ExtraParameter* createNewParameterEntry(U16 param_type); ExtraParameter* getExtraParameterEntry(U16 param_type) const; |