diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-16 01:08:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 01:08:13 +0300 |
| commit | d41e167aa9a22b446cbcfe6fd4ebdd810c61ba73 (patch) | |
| tree | 3ed50d019b3d78c748ed6b46ca69f2ca7943f41a /indra/newview/llinventorygallery.h | |
| parent | 29be88d60d654193926add496d2d851f7c217356 (diff) | |
| parent | bdb8caf790207e1a6f46d495a586b38bb52e58e9 (diff) | |
Merge pull request #1478 from secondlife/marchcat/x-mf-merge
Maint X -> Materials Featurette merge
Diffstat (limited to 'indra/newview/llinventorygallery.h')
| -rw-r--r-- | indra/newview/llinventorygallery.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h index 0c52e7b713..51444d24b0 100644 --- a/indra/newview/llinventorygallery.h +++ b/indra/newview/llinventorygallery.h @@ -152,11 +152,11 @@ public: LLInventoryGalleryItem* getFirstSelectedItem(); // Copy & paste (LLEditMenuHandler) - void copy() override; - BOOL canCopy() const override; + void copy() override; + BOOL canCopy() const override; - void cut() override; - BOOL canCut() const override; + void cut() override; + BOOL canCut() const override; void paste() override; BOOL canPaste() const override; @@ -336,7 +336,7 @@ public: std::string getItemName() {return mItemName;} std::string getItemNameSuffix() {return mPermSuffix + mWornSuffix;} bool isDefaultImage() {return mDefaultImage;} - + bool isHidden() {return mHidden;} void setHidden(bool hidden) {mHidden = hidden;} @@ -350,7 +350,7 @@ public: EInventorySortGroup getSortGroup() { return mSortGroup; } void updateNameText(); - + private: bool isFadeItem(); |
