diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-06-16 13:22:19 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-06-16 13:22:19 -0700 |
| commit | f11dd1d8a3dc4ba9a3c23563126e11ee971e219f (patch) | |
| tree | cc2798f96eafb50f42d097da7ac53e152777c402 /indra/newview/llinventorybridge.h | |
| parent | 483bd134162ffeef8760173aa223daee81c0f9e3 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rwxr-xr-x | indra/newview/llinventorybridge.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index bc875e8f37..02134c7cc5 100755 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -252,7 +252,7 @@ public: LLFolderBridge(LLInventoryPanel* inventory, LLFolderView* root, const LLUUID& uuid) - : LLInvFVBridge(inventory, root, uuid), + : LLInvFVBridge(inventory, root, uuid), mCallingCards(FALSE), mWearables(FALSE), mIsLoading(false) @@ -276,6 +276,8 @@ public: virtual LLUIImagePtr getIconOverlay() const; static LLUIImagePtr getIcon(LLFolderType::EType preferred_type); + + virtual std::string getLabelSuffix() const; virtual BOOL renameItem(const std::string& new_name); |