diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-12 13:22:58 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-12 13:22:58 -0700 |
| commit | 4a1ef20c317897e7e509c7f599e97fcc90ffaefc (patch) | |
| tree | c496bd8785b94bb60bca33ea59758c5929341451 /indra/llinventory/llinventory.h | |
| parent | 895e8ad446ab383e1211f759e8b55aa0fff2efc1 (diff) | |
| parent | d4b2897700c66354413af42ab055bd1aaa47f91c (diff) | |
merge
Diffstat (limited to 'indra/llinventory/llinventory.h')
| -rw-r--r-- | indra/llinventory/llinventory.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 64af6c94f5..bd581e860f 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -93,7 +93,6 @@ public: virtual const LLUUID& getUUID() const; const LLUUID& getParentUUID() const; virtual const LLUUID& getLinkedUUID() const; // get the inventoryID that this item points to, else this item's inventoryID - virtual const std::string& getName() const; virtual LLAssetType::EType getType() const; LLAssetType::EType getActualType() const; // bypasses indirection for linked items @@ -263,6 +262,10 @@ public: void setInventoryType(LLInventoryType::EType inv_type); void setFlags(U32 flags); void setCreationDate(time_t creation_date_utc); + + // Check for changes in permissions masks and sale info + // and set the corresponding bits in mFlags + void accumulatePermissionSlamBits(const LLInventoryItem& old_item); // This is currently only used in the Viewer to handle calling cards // where the creator is actually used to store the target. |