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

FIRE-21263: Remove the confusing temporary toggle of "Show Highlight" in build floater and make the change permanent

Ansariel 2017-11-24 18:57:04 +01:00
parent 844d6c3ba0
commit bcfeda1fde
8 changed files with 9 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
indra/newview/llfloatertools.cpp
View File

@ -126,9 +126,6 @@ void commit_radio_group_land(LLUICtrl* ctrl);
void commit_grid_mode(LLUICtrl *);
void commit_slider_zoom(LLUICtrl *ctrl);
// <FS:KC> show/hide build highlight
void commit_show_highlight(void *ctrl);
/**
* Class LLLandImpactsObserver
*
@ -271,13 +268,9 @@ BOOL LLFloaterTools::postBuild()
// <FS:KC> show highlight
mCheckShowHighlight = getChild<LLCheckBoxCtrl>("checkbox show highlight");
mCheckShowHighlight->setValue(gSavedSettings.getBOOL("RenderHighlightSelections"));
LLSelectMgr::instance().setFSShowHideHighlight(FS_SHOW_HIDE_HIGHLIGHT_NORMAL);
mCheckActualRoot = getChild<LLCheckBoxCtrl>("checkbox actual root");
// </FS:KC>
//
// Create Buttons
//
@ -483,9 +476,6 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
// <FS:Ansariel> FIRE-7802: Grass and tree selection in build tool
mCommitCallbackRegistrar.add("BuildTool.TreeGrass", boost::bind(&LLFloaterTools::onSelectTreeGrassCombo, this));
// <FS:KC> show/hide build highlight
mCommitCallbackRegistrar.add("BuildTool.commitShowHighlight", boost::bind(&commit_show_highlight, this));
mLandImpactsObserver = new LLLandImpactsObserver();
LLViewerParcelMgr::getInstance()->addObserver(mLandImpactsObserver);
}
@ -1080,15 +1070,6 @@ void LLFloaterTools::onOpen(const LLSD& key)
{
mParcelSelection = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection();
mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
// <FS:KC> Set the check box value from the saved setting
// this function runs on selection change
if (!mOpen)
{
mOpen = TRUE;
mCheckShowHighlight->setValue(gSavedSettings.getBOOL("RenderHighlightSelections"));
}
// </FS:KC>
std::string panel = key.asString();
if (!panel.empty())
@ -1118,12 +1099,6 @@ void LLFloaterTools::onClose(bool app_quitting)
LLSelectMgr::getInstance()->promoteSelectionToRoot();
gSavedSettings.setBOOL("EditLinkedParts", FALSE);
// <FS:KC>
LLSelectMgr::instance().setFSShowHideHighlight(FS_SHOW_HIDE_HIGHLIGHT_NORMAL);
mOpen = FALSE; //hack cause onOpen runs on every selection change but onClose doesnt.
// </FS:KC>
gViewerWindow->showCursor();
resetToolState();
@ -1320,23 +1295,6 @@ void commit_select_component(void *data)
}
}
// <FS:KC> show/hide build highlight
void commit_show_highlight(void *data)
{
LLFloaterTools* floaterp = (LLFloaterTools*)data;
BOOL show_highlight = floaterp->mCheckShowHighlight->get();
if (show_highlight)
{
LLSelectMgr::getInstance()->setFSShowHideHighlight(FS_SHOW_HIDE_HIGHLIGHT_SHOW);
}
else
{
LLSelectMgr::getInstance()->setFSShowHideHighlight(FS_SHOW_HIDE_HIGHLIGHT_HIDE);
}
}
// </FS:KC>
// static
void LLFloaterTools::setObjectType( LLPCode pcode )
{

2
indra/newview/llfloatertools.h
View File

@ -224,14 +224,12 @@ public:
private:
BOOL mDirty;
BOOL mHasSelection;
BOOL mOpen; //Phoenix:KC
//Phoenix:KC
S32 mCollapsedHeight;
S32 mExpandedHeight;
std::map<std::string, std::string> mStatusText;
protected:
LLSD mMediaSettings;

10
indra/newview/llselectmgr.cpp
View File

@ -238,11 +238,6 @@ LLSelectMgr::LLSelectMgr()
mForceSelection = FALSE;
mShowSelection = FALSE;
// <FS:KC> show/hide build highlight
mFSShowHideHighlight = FS_SHOW_HIDE_HIGHLIGHT_NORMAL;
// </FS:KC>
}
@ -5953,10 +5948,7 @@ void LLSelectMgr::updateSelectionSilhouette(LLObjectSelectionHandle object_handl
}
void LLSelectMgr::renderSilhouettes(BOOL for_hud)
{
// <FS:KC> show/hide build highlight
// if (!mRenderSilhouettes || !mRenderHighlightSelections)
if (((mFSShowHideHighlight == FS_SHOW_HIDE_HIGHLIGHT_NORMAL) && (!mRenderSilhouettes || !mRenderHighlightSelections)) || (mFSShowHideHighlight == FS_SHOW_HIDE_HIGHLIGHT_HIDE))
// </FS:KC>
if (!mRenderSilhouettes || !mRenderHighlightSelections)
{
return;
}

17
indra/newview/llselectmgr.h
View File

@ -69,15 +69,6 @@ const S32 MAX_CHILDREN_PER_TASK = 255;
const S32 MAX_CHILDREN_PER_PHYSICAL_TASK = 32;
// </FS:Ansariel>
// <FS:KC> show/hide build highlight
enum EFSShowHideHighlight
{
FS_SHOW_HIDE_HIGHLIGHT_NORMAL = 0,
FS_SHOW_HIDE_HIGHLIGHT_SHOW = 1,
FS_SHOW_HIDE_HIGHLIGHT_HIDE = 2
};
// </FS:KC>
// This is used by the DeRezObject message to determine where to put
// derezed tasks.
enum EDeRezDestination
@ -621,10 +612,6 @@ public:
void renderSilhouettes(BOOL for_hud);
void enableSilhouette(BOOL enable) { mRenderSilhouettes = enable; }
// <FS:KC> show/hide build highlight
void setFSShowHideHighlight(EFSShowHideHighlight state) { mFSShowHideHighlight = state; }
// </FS:KC>
////////////////////////////////////////////////////////////////
// Utility functions that operate on the current selection
////////////////////////////////////////////////////////////////
@ -926,10 +913,6 @@ private:
LLAnimPauseRequest mPauseRequest;
// <FS:KC> show/hide build highlight
EFSShowHideHighlight mFSShowHideHighlight;
// </FS:KC>
// <FS:Zi> Warning when trying to duplicate while in edit linked parts/select face mode
public:
// returns TRUE if current selection does not contain individual selections

7
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -395,15 +395,12 @@
width="134" />
<check_box
height="18"
initial_value="true"
control_name="RenderHighlightSelections"
label="Show Highlight"
layout="topleft"
top_pad="-2"
name="checkbox show highlight"
width="134" >
<check_box.commit_callback
function="BuildTool.commitShowHighlight"/>
</check_box>
width="134"/>
<button
left_pad="0"
image_selected="ForwardArrow_Press"

7
indra/newview/skins/starlight/xui/en/floater_tools.xml
View File

@ -393,15 +393,12 @@
width="134" />
<check_box
height="18"
initial_value="true"
control_name="RenderHighlightSelections"
label="Show Highlight"
layout="topleft"
top_pad="-2"
name="checkbox show highlight"
width="134" >
<check_box.commit_callback
function="BuildTool.commitShowHighlight"/>
</check_box>
width="134"/>
<button
left_pad="0"
image_selected="ForwardArrow_Press"

7
indra/newview/skins/starlightcui/xui/en/floater_tools.xml
View File

@ -393,15 +393,12 @@
width="134" />
<check_box
height="18"
initial_value="true"
control_name="RenderHighlightSelections"
label="Show Highlight"
layout="topleft"
top_pad="-2"
name="checkbox show highlight"
width="134" >
<check_box.commit_callback
function="BuildTool.commitShowHighlight"/>
</check_box>
width="134"/>
<button
left_pad="0"
image_selected="ForwardArrow_Press"

7
indra/newview/skins/vintage/xui/en/floater_tools.xml
View File

@ -395,15 +395,12 @@
width="134" />
<check_box
height="18"
initial_value="true"
control_name="RenderHighlightSelections"
label="Show Highlight"
layout="topleft"
top_pad="-2"
name="checkbox show highlight"
width="134" >
<check_box.commit_callback
function="BuildTool.commitShowHighlight"/>
</check_box>
width="134"/>
<button
left_pad="0"
layout="topleft"