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

* FIRE-4282: Added option to change colors for chat rings on minimap 

* Changed the default color to something better visible
* Chat rings now distinguish between chat range and shout range
Ansariel 2012-01-04 12:48:33 +01:00
parent 700a79e328
commit 2ea68ba215
4 changed files with 92 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llnetmap.cpp
View File

@ -191,7 +191,8 @@ void LLNetMap::draw()
static LLUIColor map_track_disabled_color = LLUIColorTable::instance().getColor("MapTrackDisabledColor", LLColor4::white);
static LLUIColor map_frustum_color = LLUIColorTable::instance().getColor("MapFrustumColor", LLColor4::white);
static LLUIColor map_frustum_rotating_color = LLUIColorTable::instance().getColor("MapFrustumRotatingColor", LLColor4::white);
static LLUIColor map_chat_ring_color = LLUIColorTable::instance().getColor("MapChatRingColor", LLColor4::white);
static LLUIColor map_chat_ring_color = LLUIColorTable::instance().getColor("MapChatRingColor", LLColor4::yellow);
static LLUIColor map_shout_ring_color = LLUIColorTable::instance().getColor("MapShoutRingColor", LLColor4::red);
if (mObjectImagep.isNull())
{
@ -558,7 +559,7 @@ void LLNetMap::draw()
if(chat_ring)
{
drawRing(20.0, pos_map, map_chat_ring_color);
drawRing(100.0, pos_map, map_chat_ring_color);
drawRing(100.0, pos_map, map_shout_ring_color);
}
}

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

@ -734,7 +734,10 @@
reference="BrickBrown" />
<color
name="MapChatRingColor"
value="0 0 1 0.1" />
value="1 1 0 0.3" />
<color
name="MapShoutRingColor"
value="1 0 0 0.3" />
<color
name="MenuBarBgColor"
reference="DkGray" />

9
indra/newview/skins/default/xui/de/panel_preferences_colors.xml
View File

@ -3,7 +3,16 @@
<text name="effects_color_textbox">
Meine Effekte (Auswahlstrahl):
</text>
<text name="netmap_color_textbox">
Mini-Karte:
</text>
<color_swatch name="effect_color_swatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
<text name="netmap_chatring_color_label">
Chat-Reichweite
</text>
<text name="netmap_shoutring_color_label">
Ruf-Reichweite
</text>
<text name="font_colors">
Schriftfarben für Chat:
</text>

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

@ -21,6 +21,17 @@
width="200">
Selection Effects (Particle Beam):
</text>
<text
type="string"
length="1"
follows="left|top"
layout="topleft"
height="15"
left_delta="200"
name="netmap_color_textbox"
width="100">
Minimap:
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
@ -29,7 +40,6 @@
layout="topleft"
left="40"
name="effect_color_swatch"
tool_tip="Click to open Color Picker"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
@ -40,13 +50,77 @@
<color_swatch.caption_text
height="0" />
</color_swatch>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left_delta="200"
name="netmap_chatring_color_swatch"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="MapChatRingColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="MapChatRingColor" />
<color_swatch.caption_text
height="0" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="netmap_chatring_color_label"
top_delta="5"
width="95">
Chat range
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left_delta="100"
top_pad="-15"
name="netmap_shoutring_color_swatch"
tool_tip="Click to open Color Picker"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="MapShoutRingColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="MapShoutRingColor" />
<color_swatch.caption_text
height="0" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="netmap_shoutring_color_label"
top_delta="5"
width="95">
Shout range
</text>
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="font_colors"
top_pad="10"
top_pad="20"
width="120">
UI Text Colors:
</text>