Skip to content
Snippets Groups Projects
Commit 7127fa49 authored by Richard Linden's avatar Richard Linden
Browse files

EXT-7750 - Wearing list does not need to be bold or show link or worn

parent 92768103
No related branches found
No related tags found
No related merge requests found
...@@ -181,6 +181,7 @@ LLFolderView::LLFolderView(const Params& p) ...@@ -181,6 +181,7 @@ LLFolderView::LLFolderView(const Params& p)
mRenameItem( NULL ), mRenameItem( NULL ),
mNeedsScroll( FALSE ), mNeedsScroll( FALSE ),
mEnableScroll( true ), mEnableScroll( true ),
mUseLabelSuffix(p.use_label_suffix),
mPinningSelectedItem(FALSE), mPinningSelectedItem(FALSE),
mNeedsAutoSelect( FALSE ), mNeedsAutoSelect( FALSE ),
mAutoSelectOverride(FALSE), mAutoSelectOverride(FALSE),
......
...@@ -96,6 +96,7 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler ...@@ -96,6 +96,7 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler
Mandatory<LLPanel*> parent_panel; Mandatory<LLPanel*> parent_panel;
Optional<LLUUID> task_id; Optional<LLUUID> task_id;
Optional<std::string> title; Optional<std::string> title;
Optional<bool> use_label_suffix;
}; };
LLFolderView(const Params&); LLFolderView(const Params&);
virtual ~LLFolderView( void ); virtual ~LLFolderView( void );
...@@ -273,6 +274,7 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler ...@@ -273,6 +274,7 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler
virtual S32 notify(const LLSD& info) ; virtual S32 notify(const LLSD& info) ;
void setEnableScroll(bool enable_scroll) { mEnableScroll = enable_scroll; } void setEnableScroll(bool enable_scroll) { mEnableScroll = enable_scroll; }
bool useLabelSuffix() { return mUseLabelSuffix; }
private: private:
void updateRenamerPosition(); void updateRenamerPosition();
...@@ -309,6 +311,7 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler ...@@ -309,6 +311,7 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler
BOOL mNeedsAutoSelect; BOOL mNeedsAutoSelect;
BOOL mAutoSelectOverride; BOOL mAutoSelectOverride;
BOOL mNeedsAutoRename; BOOL mNeedsAutoRename;
bool mUseLabelSuffix;
BOOL mDebugFilters; BOOL mDebugFilters;
U32 mSortOrder; U32 mSortOrder;
......
...@@ -289,8 +289,11 @@ void LLFolderViewItem::refreshFromListener() ...@@ -289,8 +289,11 @@ void LLFolderViewItem::refreshFromListener()
mCreationDate = mListener->getCreationDate(); mCreationDate = mListener->getCreationDate();
dirtyFilter(); dirtyFilter();
} }
mLabelStyle = mListener->getLabelStyle(); if (mRoot->useLabelSuffix())
mLabelSuffix = mListener->getLabelSuffix(); {
mLabelStyle = mListener->getLabelStyle();
mLabelSuffix = mListener->getLabelSuffix();
}
} }
} }
......
...@@ -110,7 +110,7 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) : ...@@ -110,7 +110,7 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
} }
} }
BOOL LLInventoryPanel::postBuild() void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
{ {
LLMemType mt(LLMemType::MTYPE_INVENTORY_POST_BUILD); LLMemType mt(LLMemType::MTYPE_INVENTORY_POST_BUILD);
...@@ -128,6 +128,7 @@ BOOL LLInventoryPanel::postBuild() ...@@ -128,6 +128,7 @@ BOOL LLInventoryPanel::postBuild()
p.rect = folder_rect; p.rect = folder_rect;
p.parent_panel = this; p.parent_panel = this;
p.tool_tip = p.name; p.tool_tip = p.name;
p.use_label_suffix = params.use_label_suffix;
mFolderRoot = LLUICtrlFactory::create<LLFolderView>(p); mFolderRoot = LLUICtrlFactory::create<LLFolderView>(p);
mFolderRoot->setAllowMultiSelect(mAllowMultiSelect); mFolderRoot->setAllowMultiSelect(mAllowMultiSelect);
} }
...@@ -174,8 +175,6 @@ BOOL LLInventoryPanel::postBuild() ...@@ -174,8 +175,6 @@ BOOL LLInventoryPanel::postBuild()
setSortOrder(gSavedSettings.getU32(DEFAULT_SORT_ORDER)); setSortOrder(gSavedSettings.getU32(DEFAULT_SORT_ORDER));
} }
mFolderRoot->setSortOrder(getFilter()->getSortOrder()); mFolderRoot->setSortOrder(getFilter()->getSortOrder());
return TRUE;
} }
LLInventoryPanel::~LLInventoryPanel() LLInventoryPanel::~LLInventoryPanel()
......
...@@ -87,6 +87,7 @@ class LLInventoryPanel : public LLPanel ...@@ -87,6 +87,7 @@ class LLInventoryPanel : public LLPanel
Optional<bool> show_item_link_overlays; Optional<bool> show_item_link_overlays;
Optional<Filter> filter; Optional<Filter> filter;
Optional<std::string> start_folder; Optional<std::string> start_folder;
Optional<bool> use_label_suffix;
Params() Params()
: sort_order_setting("sort_order_setting"), : sort_order_setting("sort_order_setting"),
...@@ -94,7 +95,8 @@ class LLInventoryPanel : public LLPanel ...@@ -94,7 +95,8 @@ class LLInventoryPanel : public LLPanel
allow_multi_select("allow_multi_select", true), allow_multi_select("allow_multi_select", true),
show_item_link_overlays("show_item_link_overlays", false), show_item_link_overlays("show_item_link_overlays", false),
filter("filter"), filter("filter"),
start_folder("start_folder") start_folder("start_folder"),
use_label_suffix("use_label_suffix", true)
{} {}
}; };
...@@ -103,6 +105,7 @@ class LLInventoryPanel : public LLPanel ...@@ -103,6 +105,7 @@ class LLInventoryPanel : public LLPanel
//-------------------------------------------------------------------- //--------------------------------------------------------------------
protected: protected:
LLInventoryPanel(const Params&); LLInventoryPanel(const Params&);
void initFromParams(const Params&);
friend class LLUICtrlFactory; friend class LLUICtrlFactory;
public: public:
virtual ~LLInventoryPanel(); virtual ~LLInventoryPanel();
...@@ -110,8 +113,6 @@ class LLInventoryPanel : public LLPanel ...@@ -110,8 +113,6 @@ class LLInventoryPanel : public LLPanel
public: public:
LLInventoryModel* getModel() { return mInventory; } LLInventoryModel* getModel() { return mInventory; }
BOOL postBuild();
// LLView methods // LLView methods
void draw(); void draw();
BOOL handleHover(S32 x, S32 y, MASK mask); BOOL handleHover(S32 x, S32 y, MASK mask);
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
mouse_opaque="true" mouse_opaque="true"
name="cof_tab" name="cof_tab"
start_folder="Current Outfit" start_folder="Current Outfit"
use_label_suffix="false"
width="315" /> width="315" />
</tab_container> </tab_container>
<panel <panel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment