summaryrefslogtreecommitdiff
path: root/indra/llui/llfolderviewmodel.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-03-19 13:40:19 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-03-19 13:40:19 +0200
commit5f6a025397d0bcca27adc01fcb6fc324b7bdbd4d (patch)
treeb03addbbb4d58c3ae1838ea8c9127349904de9d8 /indra/llui/llfolderviewmodel.h
parenta66932a091bac4d4ca1a861901b9cef619a406f7 (diff)
Revert "SL-14927 Some avatar names not resolving in chat"
This reverts commit a66932a091bac4d4ca1a861901b9cef619a406f7.
Diffstat (limited to 'indra/llui/llfolderviewmodel.h')
-rw-r--r--indra/llui/llfolderviewmodel.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
index 8684c71672..f4ddfa8f18 100644
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -218,8 +218,7 @@ public:
virtual S32 getSortVersion() = 0;
virtual void setSortVersion(S32 version) = 0;
virtual void setParent(LLFolderViewModelItem* parent) = 0;
- virtual LLFolderViewModelItem* getParent() const = 0;
- virtual bool hasParent() const = 0;
+ virtual bool hasParent() = 0;
protected:
@@ -359,8 +358,7 @@ public:
protected:
virtual void setParent(LLFolderViewModelItem* parent) { mParent = parent; }
- virtual LLFolderViewModelItem* getParent() const { return mParent; }
- virtual bool hasParent() const { return mParent != NULL; }
+ virtual bool hasParent() { return mParent != NULL; }
S32 mSortVersion;
bool mPassedFilter;