diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-09 04:27:06 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-09 04:27:06 +0000 |
| commit | 4601aef70abe611a2a25b3e236cc089ff2bcb6af (patch) | |
| tree | ad639e7d5c1724c64cc0d894ebceb017f57dd92b /indra/newview/skins/default | |
| parent | 579d8447d3269fc6ed747774f1b612a88d850781 (diff) | |
merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873
Diffstat (limited to 'indra/newview/skins/default')
4 files changed, 14 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml index f5af8e7b30..4dc4a9ff46 100644 --- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml +++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml @@ -11,7 +11,7 @@ bevel_style="in" bg_alpha_color="0 0 0 0"> <chiclet_im_p2p - name="chiclet" + name="p2p_chiclet" layout="topleft" follows="left" top="5" @@ -19,6 +19,15 @@ height="25" width="45"> </chiclet_im_p2p> + <chiclet_im_group + name="group_chiclet" + layout="topleft" + follows="left" + top="5" + left="5" + height="25" + width="45"> + </chiclet_im_group> <text type="string" name="contact_name" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 79ca839f28..df91920721 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -33,12 +33,13 @@ top="0" width="5"/> <layout_panel + auto_resize="false" follows="left|right" height="28" layout="topleft" left="5" min_height="28" - width="500" + width="600" top="0" min_width="305" name="chat_bar" diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 297a3762f6..a37ed76c51 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -17,6 +17,7 @@ show_text_as_tentative="false" max_chars="20" follows="left|top" + allow_new_values="true" > <info_button name="Place Information" label="" diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml index a03d90876a..6e73e997e0 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml @@ -5,6 +5,7 @@ show_text_as_tentative="false" dropdown_button_visible="false" max_chars="256" + allow_new_values="true" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" background_image_focused="TextField_Search_Active"> |