diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-09-08 22:09:44 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-09-08 22:09:44 -0700 |
| commit | c4577856ed913ba7070a6bd1ad8e91c454e7bd6c (patch) | |
| tree | fca971acb386a33fd6a63690835dc21554a65bc5 /indra/newview/llinventorybridge.h | |
| parent | abacb1bfaa4359350dcff7ef24ade49144704df0 (diff) | |
DD-104 : Use default folder icons for stock folders outside of the marketplace root
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rwxr-xr-x | indra/newview/llinventorybridge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 13215e5934..091aff71b1 100755 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -284,9 +284,9 @@ public: virtual LLUIImagePtr getIcon() const; virtual LLUIImagePtr getIconOpen() const; virtual LLUIImagePtr getIconOverlay() const; + static LLUIImagePtr getIcon(LLFolderType::EType preferred_type); virtual std::string getLabelSuffix() const; virtual LLFontGL::StyleFlags getLabelStyle() const; - static LLUIImagePtr getIcon(LLFolderType::EType preferred_type); virtual BOOL renameItem(const std::string& new_name); @@ -362,6 +362,7 @@ private: void callback_pasteFromClipboard(const LLSD& notification, const LLSD& response); void perform_pasteFromClipboard(); void gatherMessage(std::string& message, LLError::ELevel log_level); + LLUIImagePtr getFolderIcon(BOOL is_open) const; bool mCallingCards; bool mWearables; |