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

STORM-161 : Reimplement hide object selection

Merov Linden 2010-09-16 15:31:07 -07:00
parent 586ad99554
commit 24473fc0d6
5 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -20,6 +20,7 @@ Aimee Trescothick
SNOW-227
SNOW-570
SNOW-572
SNOW-575
VWR-3321
VWR-3336
VWR-3903
@ -33,6 +34,7 @@ Aimee Trescothick
VWR-6550
VWR-6583
VWR-6482
VWR-6918
VWR-7109
VWR-7383
VWR-7800

11
indra/newview/app_settings/settings.xml
View File

@ -7899,6 +7899,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderHighlightSelections</key>
<map>
<key>Comment</key>
<string>Show selection outlines on objects</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RenderHiddenSelections</key>
<map>
<key>Comment</key>

3
indra/newview/llselectmgr.cpp
View File

@ -181,6 +181,7 @@ template class LLSelectMgr* LLSingleton<class LLSelectMgr>::getInstance();
//-----------------------------------------------------------------------------
LLSelectMgr::LLSelectMgr()
: mHideSelectedObjects(LLCachedControl<bool>(gSavedSettings, "HideSelectedObjects", FALSE)),
mRenderHighlightSelections(LLCachedControl<bool>(gSavedSettings, "RenderHighlightSelections", TRUE)),
mAllowSelectAvatar( LLCachedControl<bool>(gSavedSettings, "AllowSelectAvatar", FALSE)),
mDebugSelectMgr(LLCachedControl<bool>(gSavedSettings, "DebugSelectMgr", FALSE))
{
@ -4898,7 +4899,7 @@ void LLSelectMgr::updateSelectionSilhouette(LLObjectSelectionHandle object_handl
}
void LLSelectMgr::renderSilhouettes(BOOL for_hud)
{
if (!mRenderSilhouettes)
if (!mRenderSilhouettes || !mRenderHighlightSelections)
{
return;
}

1
indra/newview/llselectmgr.h
View File

@ -347,6 +347,7 @@ public:
static LLColor4 sContextSilhouetteColor;
LLCachedControl<bool> mHideSelectedObjects;
LLCachedControl<bool> mRenderHighlightSelections;
LLCachedControl<bool> mAllowSelectAvatar;
LLCachedControl<bool> mDebugSelectMgr;

10
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -772,6 +772,16 @@
<menu_item_separator/>
<menu_item_check
label="Show Selection Outlines"
name="Show Selection Outlines">
<menu_item_check.on_check
function="CheckControl"
parameter="RenderHighlightSelections" />
<menu_item_check.on_click
function="ToggleControl"
parameter="RenderHighlightSelections" />
</menu_item_check>
<menu_item_check
label="Show Hidden Selection"
name="Show Hidden Selection">