livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show buttons to cycle through linkset in build floater only when in Edit mode (cont. of 990294b17c9c)

Northspring 2014-09-03 16:14:00 +02:00
parent f4ed3777ce
commit 25f05442d0
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloatertools.cpp
View File

@ -247,6 +247,11 @@ BOOL LLFloaterTools::postBuild()
mTitleMedia = getChild<LLMediaCtrl>("title_media");
mBtnLink = getChild<LLButton>("link_btn");
mBtnUnlink = getChild<LLButton>("unlink_btn");
// <FS:PP> FIRE-14493: Buttons to cycle through linkset
mBtnPrevPart = getChild<LLButton>("prev_part_btn");
mBtnNextPart = getChild<LLButton>("next_part_btn");
// </FS:PP>
mCheckSelectIndividual = getChild<LLCheckBoxCtrl>("checkbox edit linked parts");
getChild<LLUICtrl>("checkbox edit linked parts")->setValue((BOOL)gSavedSettings.getBOOL("EditLinkedParts"));
@ -396,6 +401,11 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
mBtnLink(NULL),
mBtnUnlink(NULL),
// <FS:PP> FIRE-14493: Buttons to cycle through linkset
mBtnPrevPart(NULL),
mBtnNextPart(NULL),
// </FS:PP>
mBtnDelete(NULL),
mBtnDuplicate(NULL),
mBtnDuplicateInPlace(NULL),
@ -825,6 +835,11 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
mBtnLink->setEnabled(LLSelectMgr::instance().enableLinkObjects());
mBtnUnlink->setEnabled(LLSelectMgr::instance().enableUnlinkObjects());
// <FS:PP> FIRE-14493: Buttons to cycle through linkset
mBtnPrevPart->setVisible(edit_visible);
mBtnNextPart->setVisible(edit_visible);
// </FS:PP>
if (mCheckSelectIndividual)
{
mCheckSelectIndividual->setVisible(edit_visible);

5
indra/newview/llfloatertools.h
View File

@ -152,6 +152,11 @@ public:
LLButton* mBtnLink;
LLButton* mBtnUnlink;
// <FS:PP> FIRE-14493: Buttons to cycle through linkset
LLButton* mBtnPrevPart;
LLButton* mBtnNextPart;
// </FS:PP>
LLCheckBoxCtrl* mCheckSnapToGrid;
LLButton* mBtnGridOptions;
LLComboBox* mComboGridMode;