diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-06-24 21:36:42 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-06-24 21:36:42 +0000 |
| commit | a00af78b95a62c613f9a2ac4a28a0017086c5ffa (patch) | |
| tree | 25c46a6508a77d9b250fe166d7b0692983dc98f2 /indra/llinventory/llinventory.h | |
| parent | 2ce76c7ed47b49f8a7bafe69bdea064189e1ccbd (diff) | |
merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/llinventory/llinventory.h')
| -rw-r--r-- | indra/llinventory/llinventory.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 3f79cedc23..ce64317f48 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -92,9 +92,12 @@ public: // accessors 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 { return mType; } + LLAssetType::EType getActualType() const; // bypasses indirection for linked items + // mutators - will not call updateServer(); void setUUID(const LLUUID& new_uuid); void rename(const std::string& new_name); @@ -240,15 +243,16 @@ public: void generateUUID() { mUUID.generate(); } // accessors - const LLPermissions& getPermissions() const; - const LLUUID& getCreatorUUID() const; + virtual const LLUUID& getLinkedUUID() const; + virtual const LLPermissions& getPermissions() const; + virtual const LLUUID& getCreatorUUID() const; virtual const LLUUID& getAssetUUID() const; - const std::string& getDescription() const; - const LLSaleInfo& getSaleInfo() const; - LLInventoryType::EType getInventoryType() const; - U32 getFlags() const; - time_t getCreationDate() const; - U32 getCRC32() const; // really more of a checksum. + virtual const std::string& getDescription() const; + virtual const LLSaleInfo& getSaleInfo() const; + virtual LLInventoryType::EType getInventoryType() const; + virtual U32 getFlags() const; + virtual time_t getCreationDate() const; + virtual U32 getCRC32() const; // really more of a checksum. // mutators - will not call updateServer(), and will never fail // (though it may correct to sane values) |