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

FIRE-22732: Add the ability to change the color of the area search beacon.

master
Liny 2018-09-07 03:51:52 -07:00
parent 16459a02e8
commit fd0c852458
4 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/fsareasearch.cpp
View File

@ -143,8 +143,6 @@ FSAreaSearch::FSAreaSearch(const LLSD& key) :
mFilterPermModify(false),
mFilterPermTransfer(false),
mFilterAgentParcelOnly(false),
mBeaconColor(),
mBeaconTextColor(),
mBeacons(false),
mExcludeAttachment(true),
mExcludeTemporary(true),
@ -197,10 +195,7 @@ BOOL FSAreaSearch::postBuild()
mTab->removeTabPanel(advanced_tab);
}
}
// TODO: add area search settings to the color.xml file
mBeaconColor = LLUIColorTable::getInstance()->getColor("PathfindingLinksetBeaconColor");
mBeaconTextColor = LLUIColorTable::getInstance()->getColor("PathfindingDefaultBeaconTextColor");
return LLFloater::postBuild();
}
@ -215,6 +210,8 @@ void FSAreaSearch::draw()
LLFloater::draw();
static LLCachedControl<S32> beacon_line_width(gSavedSettings, "DebugBeaconLineWidth");
static LLUIColor mBeaconColor = LLUIColorTable::getInstance()->getColor("AreaSearchBeaconColor");
static LLUIColor mBeaconTextColor = LLUIColorTable::getInstance()->getColor("PathfindingDefaultBeaconTextColor");
if (mBeacons)
{

2
indra/newview/fsareasearch.h
View File

@ -223,8 +223,6 @@ private:
FSPanelAreaSearchAdvanced* mPanelAdvanced;
bool mBeacons;
LLColor4 mBeaconColor;
LLColor4 mBeaconTextColor;
bool mExcludeAttachment;
bool mExcludeTemporary;

3
indra/newview/skins/default/colors.xml
View File

@ -1333,4 +1333,7 @@
<color
name="ChatHistoryMessageFromLog"
reference="Gray" />
<color
name="AreaSearchBeaconColor"
reference="Blue_80" />
</colors>

29
indra/newview/skins/default/xui/en/panel_preferences_colors.xml
View File

@ -1800,6 +1800,35 @@
parameter="SearchableControlHighlightColor" />
</color_swatch>
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="preferences_search_label"
top_pad="15"
width="220">
Area search beacon Color:
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="40"
top_pad="5"
name="area_search_beacon_color"
tool_tip="Choose area search beacon color"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="AreaSearchBeaconColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="AreaSearchBeaconColor" />
</color_swatch>
<check_box
control_name="FSScriptDialogNoTransparency"
follows="left|top"