diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-06-14 07:58:04 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-14 07:58:04 -0700 |
commit | 0a6761820e49d139c8e5068a82b32df84db5b611 (patch) | |
tree | b995b4bd4c1cc4aaef25dbd1f63eb72cde7b748b /indra/newview/llinventoryitemslist.h | |
parent | 0022aff49d21f932f16fbd8131523ab47c56759f (diff) | |
parent | e96544ff266849207adfc3823adfc2dcfe42ce72 (diff) |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llinventoryitemslist.h')
-rw-r--r-- | indra/newview/llinventoryitemslist.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llinventoryitemslist.h b/indra/newview/llinventoryitemslist.h index c1b1a6f281..d6132717e8 100644 --- a/indra/newview/llinventoryitemslist.h +++ b/indra/newview/llinventoryitemslist.h @@ -122,16 +122,16 @@ public: /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); /** Get the name of a corresponding inventory item */ - const std::string& getItemName() const { return mItem->getName(); } + const std::string& getItemName() const; /** Get the asset type of a corresponding inventory item */ - LLAssetType::EType getType() const { return mItem->getType(); } + LLAssetType::EType getType() const; /** Get the wearable type of a corresponding inventory item */ - LLWearableType::EType getWearableType() const { return mItem->getWearableType(); } + LLWearableType::EType getWearableType() const; /** Get the description of a corresponding inventory item */ - const std::string& getDescription() const { return mItem->getDescription(); } + const std::string& getDescription() const; /** Get the associated inventory item */ LLViewerInventoryItem* getItem() const { return mItem; } @@ -152,7 +152,7 @@ protected: /** * Called after inventory item was updated, update panel widgets to reflect inventory changes. */ - virtual void updateItem(); + virtual void updateItem(const std::string& name); /** setter for mIconCtrl */ void setIconCtrl(LLIconCtrl* icon) { mIconCtrl = icon; } |