diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
| commit | 0bf246ed663ad11d316fe7898a3fee3f57676d4b (patch) | |
| tree | 20476d64aecbb1b644ea1f307264c222b7d2e6f6 /indra/newview/skins/default/xui/en/panel_bottomtray.xml | |
| parent | c2ca71322bf48653d466cba40bbe01c3401318c7 (diff) | |
| parent | 109b79e9ad67b5fa8967442a47ef15e456eb5bff (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_bottomtray.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_bottomtray.xml | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index ca547a79e2..de3de45718 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -103,7 +103,7 @@ min_width="52" name="gesture_panel" user_resize="false"> - <gesture_combo_box + <gesture_combo_list follows="left|right" height="23" label="Gesture" @@ -113,10 +113,10 @@ top="5" width="82" tool_tip="Shows/hides gestures"> - <gesture_combo_box.drop_down_button + <gesture_combo_list.combo_button pad_right="10" use_ellipses="true" /> - </gesture_combo_box> + </gesture_combo_list> </layout_panel> <icon auto_resize="false" @@ -382,6 +382,17 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well width="40" min_width="40" user_resize="false"> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="4" + top="0" + width="5" /> <chiclet_notification flash_period="0.25" follows="right" @@ -414,6 +425,17 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well function="Button.SetDockableFloaterToggle" parameter="notification_well_window" /> </button> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="4" + top="0" + width="5" /> </chiclet_notification> </layout_panel> </layout_stack> |