summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorygallery.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llinventorygallery.h')
-rw-r--r--indra/newview/llinventorygallery.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index ce618602df..cb95f61255 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -288,7 +288,7 @@ public:
LLFontGL* getTextFont();
- void setName(std::string name);
+ void setItemName(std::string name);
void setSelected(bool value);
void setWorn(bool value);
void setUUID(LLUUID id) {mUUID = id;}
@@ -301,7 +301,7 @@ public:
void setCreatorName(std::string name) {mCreatorName = name;}
std::string getCreatorName() { return mCreatorName;}
- std::string getItemName() {return mName;}
+ std::string getItemName() {return mItemName;}
std::string getItemNameSuffix() {return mPermSuffix + mWornSuffix;}
bool isDefaultImage() {return mDefaultImage;}
@@ -335,7 +335,7 @@ private:
EInventorySortGroup mSortGroup;
LLAssetType::EType mType;
- std::string mName;
+ std::string mItemName;
std::string mWornSuffix;
std::string mPermSuffix;
LLInventoryGallery* mGallery;