diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
commit | cb957d3dabfd0a419cb70461cc5bf3af2adba7a3 (patch) | |
tree | ac9978539aa02d80bf8c026aa3b2e1ba85404ecf /indra/newview/skins/default | |
parent | 7819b49086729187e198bf69f9c45f1c63f11ff2 (diff) | |
parent | b8320207bb911a311a498426fdd4a987dd7748ea (diff) |
merge late 3.0.1 beta candidate fixes
Diffstat (limited to 'indra/newview/skins/default')
4 files changed, 51 insertions, 32 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index 6d90f654d1..eaf575fc08 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - can_resize="true" + can_resize="true" height="775" - layout="topleft" - min_height="400" + layout="topleft" + min_height="400" min_width="500" name="floater_web_content" help_topic="floater_web_content" - save_rect="true" + save_rect="true" auto_tile="true" - save_visibility="true" + save_visibility="true" title="" initial_mime_type="text/html" width="780" - tab_stop="true" + tab_stop="true" filename="floater_web_content.xml"/> diff --git a/indra/newview/skins/default/xui/en/menu_mode_change.xml b/indra/newview/skins/default/xui/en/menu_mode_change.xml new file mode 100644 index 0000000000..87d1a0a7a2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_mode_change.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + name="Mode Change"> + <menu_item_check + label="Basic" + name="BasicMode"> + <on_check + function="CheckSessionSettings" + parameter="settings_minimal.xml" /> + <on_click + function="ChangeMode" + parameter="basic"/> + </menu_item_check> + <menu_item_check + label="Advanced" + name="AdvancedMode"> + <on_check + function="CheckSessionSettings" + parameter="" /> + <on_click + function="ChangeMode" + parameter="advanced"/> + </menu_item_check> + </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 8d0f1437e6..0bc1be666e 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -117,33 +117,16 @@ label="Remember password" name="connect_btn" top="35" width="90" /> - <text - follows="left|bottom" - font="SansSerifSmall" - height="15" - left_pad="10" - name="mode_selection_text" - top="20" - width="130"> - Mode: - </text> -<combo_box - follows="left|bottom" + <menu_button + left_pad="5" + top="35" + width="80" height="23" - max_chars="128" + label="Mode ▲" + name="mode_menu" tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." - top_pad="0" - name="mode_combo" - width="110"> -<combo_box.item - label="Basic" - name="Basic" - value="settings_minimal.xml" /> -<combo_box.item - label="Advanced" - name="Advanced" - value="" /> -</combo_box> + menu_filename="menu_mode_change.xml" + /> <text follows="left|bottom" font="SansSerifSmall" diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index d756dfb7de..f51279adb4 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -77,6 +77,18 @@ top="0" width="55" /> </panel> + <menu_button + follows="right|top" + image_color="0 0 0 0" + hover_glow_amount="0" + left_pad="2" + top="0" + width="55" + height="18" + label="Mode ▼" + tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." + menu_filename="menu_mode_change.xml" + /> <text type="string" font="SansSerifSmall" @@ -89,7 +101,7 @@ left_pad="0" name="TimeText" tool_tip="Current time (Pacific)" - width="145"> + width="70"> 24:00 AM PST </text> <button |