diff --git a/doc/contributions.txt b/doc/contributions.txt index adfee2cce9c0885026d90ada659423e870e91328..d4e459039db0503334d2d4b05f288e24bb50795f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -768,16 +768,16 @@ WolfPup Lowenhar STORM-102 STORM-103 STORM-143 + STORM-255 + STORM-256 STORM-535 STORM-544 STORM-654 + STORM-674 VWR-20741 VWR-20933 Zai Lynch VWR-19505 -Wolfpup Lowenhar - STORM-255 - STORM-256 Zarkonnen Decosta VWR-253 Zi Ree diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 6dc419a96c2b095014ffc96d22f54fa1fc9f7e41..0c75399764aa627670c318bf3b19d5989d80f726 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -317,7 +317,7 @@ layout="topleft" left="30" height="12" - name="bubble_chat" + name="floater_opacity" top_pad="15" width="120" > @@ -355,7 +355,7 @@ left="50" max_val="1.00" min_val="0.00" - name="active" + name="inactive" show_text="true" top_pad="5" width="415" />