diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-11-23 20:55:18 -0500 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-11-23 20:55:18 -0500 |
| commit | abf406e3d5f957d66618afaf02f54d0d686bda67 (patch) | |
| tree | c15f677d5594deb01e7327153ae3191c6047b1b4 | |
| parent | b12a2d2fd9fc4aaaf45ef893c86fd1d5f6d37372 (diff) | |
STORM-674: corrected duplicate name tags in pannel_preferences_color.xml
| -rw-r--r-- | doc/contributions.txt | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_colors.xml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index adfee2cce9..d4e459039d 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 6dc419a96c..0c75399764 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" /> |