diff options
| author | James Cook <james@lindenlab.com> | 2009-08-28 16:51:34 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-08-28 16:51:34 +0000 |
| commit | eda3831041a176ae11116bd0c33077d121dc62e2 (patch) | |
| tree | de4f3e33490cd7f18853296bc06be8c211bb0a47 /indra/newview/skins/default/xui/en | |
| parent | 9e2cb2f4a00a6acc48738f9df788ad5adfc7d62a (diff) | |
skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.
CHANGES:
minor layout change: "start location" and "remember password" weren't on the same horizontal line.
DEV-35120 image_unselected art was "transparent.j2c" - switched it out for PushButton_Off
I18N: more things are missing a.. you guessed it, a name= parameter. Breaks localization.
forgot to check this in earlier...fixes off-by-one crash when editing a script
DEV-36740 change the displayed string per Erica's request re 'You can only set your Home Location...' VIEWER-SIDE text change. This does not change the actual message coming from the server
EXT-689 Odd spinner behaviour - For Sale Price -- reviewed by james
DEV-26973 Internationalize the server msg Youcan'tset this place as home -- reviewed by james
EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- reviewed by james
EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- to be reviewed
EXT-655 Cannot choose Both logging options in Preferences -- to be reviewed
Changes to notifications.xml text to fit Style Guide and some renamed menu items
EXT-147 Ongoing revisions to new gestures layout.
DEV-35097 catch more instances of 'SLURL' and make them 'SLurl'
Removed Info Displays and Buy Currency Test from top menus.
Clean up code to use proper childGetFoo and childSetFoo calls, as well as setCommitCallback using slots.
De-inlined LLAvatarIconCtrl paramblock constructor because I was doing a full rebuild anyhow.
Commented about use of childSetCommitCallback(). De-inlined LocalizedString paramblock constructor.
eliminated memory leak
I18N: more things are missing a name= parameter, breaks localization.
EXT-714 Updated panels in sidetray that were not using the scroll_container element to adjust for viewer heights.
fix for llmessage_test crash in Windows Release builds
DEV-11254 I18N: replace all string instances of "Second Life" - do this in the foreign languages too
DEV-11254 I18N: replace all string instances of "Second Life" - found new instances from merged code
potential fix for unit test crash on parabuild, moved statics into singleton member variables to get around potential dual instantation of statics on different modules
DEV-36809 Click target for slider handles is too small -- reviewed by steve
EXT-403 change getChild<LLSpiner> to LLUICtrl to make it generic -- reviewed by richard
DEV-35938 Horizontal scroll thumb too high -- to be reviewed
EXT-386 clean up warnings - initCommitCallback...
Rename Product Engine's LLFloaterMiniInspector to LLInspectAvatar, clean up XUI XML, clean up construction code, move refresh method to postBuild() so widgets are constructed before refresh, fixed a member variable in llavatarlistitem.cpp. Reviewed with Leyla.
Login menu > Debug > Avatar Inspector shows test avatar inspector. Also added to main menu > Debug > XUI > Avatar Inspector. Changed text/layout of dummy inspector. Not reviewed.
Merging revisions 131558-131975 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22 into D:\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/skins/default/xui/en')
20 files changed, 754 insertions, 687 deletions
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index 01d8054e9a..e2f81168fa 100644 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -7,10 +7,9 @@ height="23" image_disabled="transparent.j2c" image_disabled_selected="PushButton_Selected" - image_hover_selected="PushButton_Selected" - image_hover_unselected="PushButton_Off" image_selected="PushButton_Selected" - image_unselected="transparent.j2c" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" left="2" name="favorites_bar_btn" diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index 2fd561f991..90711e3acc 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater auto_tile="true" - height="600" + height="700" layout="topleft" name="gesture_preview" width="280"> @@ -45,7 +45,7 @@ height="10" layout="topleft" left="10" - name="desc_label" + name="Name" top="25" width="100"> Name (not working yet): @@ -79,132 +79,75 @@ name="desc" top_delta="-4" width="180" /> - <!--ACCORDION GOES HERE --> - <text - type="string" - length="1" - follows="top|left" - font="SansSerifSmall" - height="10" - layout="topleft" - left="10" - name="trigger_label" - top_pad="10" - width="100"> - Chat: - </text> - <line_editor - follows="left|top" - height="20" - layout="topleft" - left_pad="5" - max_length="31" - name="trigger_editor" - top_delta="-4" - width="135" /> - <text - type="string" - length="1" - follows="top|left" - font="SansSerifSmall" - height="10" - layout="topleft" - left="10" - name="key_label" - top_pad="10" - width="100"> - Keyboard: - </text> - <combo_box - height="20" - label="None" - layout="topleft" - left_pad="5" - name="modifier_combo" - top_delta="-4" - width="50" /> - <combo_box - height="20" - label="None" - layout="topleft" - left_pad="5" - name="key_combo" - top_delta="0" - width="45" /> - <text - type="string" - length="1" - follows="top|left" - font="SansSerifSmall" - height="10" - layout="topleft" - left="10" - name="replace_text" - tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture!" - top_pad="10" - width="100"> - Replace: - </text> - <line_editor - follows="left|top" - height="20" - layout="topleft" - left_pad="5" - max_length="31" - name="replace_editor" - tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture" - top_delta="-4" - width="135" /> - - <!--ACCORDION GOES HERE --> - <scroll_list - follows="top|left" - height="110" - layout="topleft" - left="10" - name="step_list" - top_pad="10" - width="260" /> - <button - follows="top|left" - height="20" - font="SansSerifSmall" - label="Add" - layout="topleft" - left_pad="-100" - name="add_btn" - top_pad="5" - width="100" /> - - <scroll_list + <accordion + layout="topleft" + left="2" + width="276" + top="95" + height="580" + follows="all" + name="group_accordion"> + <accordion_tab + min_height="75" + title="Shortcuts" + name="snapshot_destination_tab" + an_resize="false"> + <panel + class="floater_snapshot_destination" + filename="floater_preview_gesture_shortcut.xml" + name="snapshot_destination_tab"/> + </accordion_tab> + <accordion_tab + min_height="400" + title="Steps" + name="snapshot_file_settings_tab" + can_resize="false"> + <panel + class="floater_snapshot_file_settings" + filename="floater_preview_gesture_steps.xml" + name="snapshot_file_settings_tab"/> + </accordion_tab> + <accordion_tab + min_height="100" + title="Info" + name="snapshot_capture_tab" + can_resize="false"> + <panel + class="floater_snapshot_capture" + filename="floater_snapshot_Info.xml" + name="snapshot_capture_tab"/> + </accordion_tab> + <accordion_tab + min_height="100" + title="Permissions" + name="snapshot_capture_tab" + can_resize="false"> + <panel + class="floater_snapshot_capture" + filename="floater_snapshot_Permissions.xml" + name="snapshot_capture_tab"/> + </accordion_tab> + </accordion> + <!--check_box follows="top|left" - height="110" + height="20" + label="Active" layout="topleft" - left="10" - name="library_list" - top_pad="10" - width="260"> - <scroll_list.rows - value="Animation" /> - <scroll_list.rows - value="Sound" /> - <scroll_list.rows - value="Chat" /> - <scroll_list.rows - value="Wait" /> - </scroll_list> - - + left="20" + name="active_check" + tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys. Gestures usually become inactive when there is a key binding conflict." + top="365" + width="100" /--> <button - follows="top|left" + follows="bottom|left" height="20" label="Preview" layout="topleft" left="20" name="preview_btn" - top_pad="50" + top_pad="-80" width="80" /> <button follows="top|left" @@ -225,183 +168,4 @@ top_delta="0" width="80" /> - - - <text - type="string" - length="1" - follows="top|left" - font="SansSerifSmall" - height="60" - layout="topleft" - left="10" - name="help_label" - top_pad="10" - width="200"> - All steps happen simultaneously, -unless you add wait steps. - </text> - <text - follows="top|left" - height="60" - layout="topleft" - left="10" - name="options_text" - top_pad="10" - width="205" /> - <combo_box - follows="top|left" - height="20" - layout="topleft" - left_delta="10" - name="animation_list" - top_pad="10" - width="100" /> - <combo_box - follows="top|left" - height="20" - layout="topleft" - left_delta="0" - name="sound_list" - top_delta="0" - width="100" /> - <line_editor - follows="top|left" - height="20" - layout="topleft" - left_delta="0" - max_length="127" - name="chat_editor" - top_delta="0" - width="100" /> - <radio_group - draw_border="false" - follows="top|left" - height="40" - layout="topleft" - left_pad="8" - name="animation_trigger_type" - top="445" - width="80"> - <radio_item - height="16" - label="Start" - layout="topleft" - left="3" - name="start" - top="-11" - width="80" /> - <radio_item - height="16" - label="Stop" - layout="topleft" - left_delta="0" - name="stop" - top_pad="10" - width="80" /> - </radio_group> - <check_box - follows="top|left" - height="20" - label="until animations are done" - layout="topleft" - left="16" - name="wait_anim_check" - top="430" - width="100" /> - <check_box - follows="top|left" - height="20" - label="time in seconds" - layout="topleft" - left_delta="0" - name="wait_time_check" - top_delta="20" - width="100" /> - <line_editor - follows="top|left" - height="20" - layout="topleft" - left_pad="5" - max_length="15" - name="wait_time_editor" - top_delta="0" - width="50" /> - - - - <!--accordion - layout="topleft" - left="2" - width="280" - top_pad="10" - height="600" - follows="all" - name="preview_gesture_shortcuts"> - <accordion_tab - min_height="515" - title="Shortcuts" - name="preview_gesture_shortcuts"> - <panel - class="preview_gesture_shortcuts" - filename="floater_preview_gesture_shortcuts" - name="preview_gesture_shortcuts" /> - </accordion_tab> - <accordion_tab - min_height="380" - title="Group Roles" - name="group_roles_tab" - can_resize="false"> - <panel - class="panel_group_roles" - filename="panel_group_roles.xml" - name="group_roles_tab_panel"/> - </accordion_tab> - <accordion_tab - min_height="530" - title="Group Notices" - name="group_notices_tab" - can_resize="false"> - <panel - class="panel_group_notices" - filename="panel_group_notices.xml" - name="group_notices_tab_panel"/> - </accordion_tab> - <accordion_tab - min_height="270" - title="Group Land Money" - name="group_land_tab" - can_resize="false"> - <panel - class="panel_group_land_money" - filename="panel_group_land_money.xml" - name="group_land_tab_panel"/> - </accordion_tab> - </accordion--> - - - - <!--text - type="string" - length="1" - follows="top|left" - font="SansSerifSmall" - height="10" - layout="topleft" - left="10" - name="library_label" - top_pad="10" - width="100"> - Library: - </text> - <check_box - follows="top|left" - height="20" - label="Active" - layout="topleft" - left="20" - name="active_check" - tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys. Gestures usually become inactive when there is a key binding conflict." - top="365" - width="100" /--> </floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml new file mode 100644 index 0000000000..b4a7e8fefd --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml @@ -0,0 +1,173 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_minimize="false" + follows="left|top" + height="155" + layout="topleft" + name="Gesture" + save_rect="true" + title="Gesture Shortcut" + width="260"> + <scroll_list + follows="top|left" + height="110" + layout="topleft" + left="10" + name="step_list" + top_pad="10" + width="260" /> + <button + follows="top|left" + height="20" + font="SansSerifSmall" + label="Add" + layout="topleft" + left_pad="-100" + name="add_btn" + top_pad="5" + width="100" /> + <scroll_list + follows="top|left" + height="110" + layout="topleft" + left="10" + name="library_list" + top_pad="10" + width="260"> + <scroll_list.rows + value="Animation" /> + <scroll_list.rows + value="Sound" /> + <scroll_list.rows + value="Chat" /> + <scroll_list.rows + value="Wait" /> + </scroll_list> + <button + follows="top|left" + height="20" + label="Preview" + layout="topleft" + left="20" + name="preview_btn" + top_pad="50" + width="80" /> + <button + follows="top|left" + height="20" + label="Save" + layout="topleft" + left_pad="5" + name="save_btn" + top_delta="0" + width="80" /> + <button + follows="top|left" + height="20" + label="Cancel (not working)" + layout="topleft" + left_pad="5" + name="save_btn" + top_delta="0" + width="80" /> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="60" + layout="topleft" + left="10" + name="help_label" + top_pad="10" + width="200"> + All steps happen simultaneously, +unless you add wait steps. + </text> + <text + follows="top|left" + height="60" + layout="topleft" + left="10" + name="options_text" + top_pad="10" + width="205" /> + <combo_box + follows="top|left" + height="20" + layout="topleft" + left_delta="10" + name="animation_list" + top_pad="10" + width="100" /> + <combo_box + follows="top|left" + height="20" + layout="topleft" + left_delta="0" + name="sound_list" + top_delta="0" + width="100" /> + <line_editor + follows="top|left" + height="20" + layout="topleft" + left_delta="0" + max_length="127" + name="chat_editor" + top_delta="0" + width="100" /> + <radio_group + draw_border="false" + follows="top|left" + height="40" + layout="topleft" + left_pad="8" + name="animation_trigger_type" + top="445" + width="80"> + <radio_item + height="16" + label="Start" + layout="topleft" + left="3" + name="start" + top="-11" + width="80" /> + <radio_item + height="16" + label="Stop" + layout="topleft" + left_delta="0" + name="stop" + top_pad="10" + width="80" /> + </radio_group> + <check_box + follows="top|left" + height="20" + label="until animations are done" + layout="topleft" + left="16" + name="wait_anim_check" + top="430" + width="100" /> + <check_box + follows="top|left" + height="20" + label="time in seconds" + layout="topleft" + left_delta="0" + name="wait_time_check" + top_delta="20" + width="100" /> + <line_editor + follows="top|left" + height="20" + layout="topleft" + left_pad="5" + max_length="15" + name="wait_time_editor" + top_delta="0" + width="50" /> +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml new file mode 100644 index 0000000000..75fb24d640 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_minimize="false" + follows="left|top" + height="80" + layout="topleft" + name="Gesture" + save_rect="true" + title="Gesture Shortcut" + width="260"> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="10" + layout="topleft" + left="10" + name="trigger_label" + top_pad="10" + width="100"> + Chat: + </text> + <line_editor + follows="left|top" + height="20" + layout="topleft" + left_pad="5" + max_length="31" + name="trigger_editor" + top_delta="-4" + width="135" /> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="10" + layout="topleft" + left="10" + name="key_label" + top_pad="10" + width="100"> + Keyboard: + </text> + <combo_box + height="20" + label="None" + layout="topleft" + left_pad="5" + name="modifier_combo" + top_delta="-4" + width="50" /> + <combo_box + height="20" + label="None" + layout="topleft" + left_pad="5" + name="key_combo" + top_delta="0" + width="45" /> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="10" + layout="topleft" + left="10" + name="replace_text" + tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture!" + top_pad="10" + width="100"> + Replace: + </text> + <line_editor + follows="left|top" + height="20" + layout="topleft" + left_pad="5" + max_length="31" + name="replace_editor" + tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture" + top_delta="-4" + width="135" /> +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml new file mode 100644 index 0000000000..f0e88b9dd4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_minimize="false" + follows="left|top" + height="155" + layout="topleft" + name="Gesture" + save_rect="true" + title="Gesture Shortcut" + width="260"> + <scroll_list + follows="top|left" + height="110" + layout="topleft" + left="10" + name="step_list" + top_pad="10" + width="260" /> + <button + follows="top|left" + height="20" + font="SansSerifSmall" + label="Add" + layout="topleft" + left_pad="-100" + name="add_btn" + top_pad="5" + width="100" /> + + <!--For pop out floater--> + <!--scroll_list + follows="top|left" + height="110" + layout="topleft" + left="10" + name="library_list" + top_pad="10" + width="260"> + <scroll_list.rows + value="Animation" /> + <scroll_list.rows + value="Sound" /> + <scroll_list.rows + value="Chat" /> + <scroll_list.rows + value="Wait" /> + </scroll_list> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="60" + layout="topleft" + left="10" + name="help_label" + top_pad="10" + width="200"> + All steps happen simultaneously, +unless you add wait steps. + </text> + <text + follows="top|left" + height="60" + layout="topleft" + left="10" + name="options_text" + top_pad="10" + width="205" /> + <combo_box + follows="top|left" + height="20" + layout="topleft" + left_delta="10" + name="animation_list" + top_pad="10" + width="100" /> + <combo_box + follows="top|left" + height="20" + layout="topleft" + left_delta="0" + name="sound_list" + top_delta="0" + width="100" /> + <line_editor + follows="top|left" + height="20" + layout="topleft" + left_delta="0" + max_length="127" + name="chat_editor" + top_delta="0" + width="100" /> + <radio_group + draw_border="false" + follows="top|left" + height="40" + layout="topleft" + left_pad="8" + name="animation_trigger_type" + top="445" + width="80"> + <radio_item + height="16" + label="Start" + layout="topleft" + left="3" + name="start" + top="-11" + width="80" /> + <radio_item + height="16" + label="Stop" + layout="topleft" + left_delta="0" + name="stop" + top_pad="10" + width="80" /> + </radio_group> + <check_box + follows="top|left" + height="20" + label="until animations are done" + layout="topleft" + left="16" + name="wait_anim_check" + top="430" + width="100" /> + <check_box + follows="top|left" + height="20" + label="time in seconds" + layout="topleft" + left_delta="0" + name="wait_time_check" + top_delta="20" + width="100" /> + <line_editor + follows="top|left" + height="20" + layout="topleft" + left_pad="5" + max_length="15" + name="wait_time_editor" + top_delta="0" + width="50" /--> +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml new file mode 100644 index 0000000000..cee789d435 --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> + +<!-- No title to avoid window chrome --> +<floater + background_opaque="false" + background_visible="true" + bevel_style="in" + bg_alpha_color="black" + can_minimize="false" + name="inspect_avatar" + title="" + visible="true" + width="300" + height="200" + left="0" + top="200" + > + <text + top="180" left="10" width="220" height="70" follows="left|top|right|bottom" + use_ellipses="true" word_wrap="true" + font="SansSerifHugeBold" text_color="white" + mouse_opaque="true" name="user_name" > + Codex Linden + </text> + <text + top="155" left="10" width="150" height="20" follows="left|top|right|bottom" + font="SansSerifBig" font.style="UNDERLINE" + text_color="white" + mouse_opaque="true" + name="active_group" > + The Guild + </text> + <text + top="110" left="10" width="290" height="50" follows="left|top|right|bottom" + font="SansSerifSmall" text_color="white" word_wrap="true" + mouse_opaque="true" name="user_detail" > +3 year-old account, Payment info on file +Languages: English, Spanish; +5 Sexterity Vest + </text> + <avatar_icon + top="185" left="230" width="60" height="60" follows="left|top|right|bottom" + color="1 1 1 1" enabled="true" mouse_opaque="true" name="avatar_icon" + /> + <slider + bottom="35" left="45" width="250" height="30" follows="top|left" + name="volume_slider" + tool_tip="Voice Volume" + increment="0.05" initial_value="0.75" max_val="1" min_val="0" + show_text="false" + /> + <button + bottom="40" left="10" width="32" height="16" follows="left|top|right|bottom" + name="mute_btn" + label="" + image_unselected="icn_speaker_dark.tga" + image_disabled="icn_speaker_dark.tga" + image_selected="icn_speaker-muted_dark.tga" + image_hover_selected="icn_speaker-muted_dark.tga" + image_disabled_selected="icn_speaker-muted_dark.tga" + halign="center" + toggle="true" + /> + <button + bottom="10" left="10" width="110" height="20" follows="top|left" + name="add_friend_btn" + label="Add Friend" + font="SansSerif" + /> + <button + bottom="10" left="120" width="110" height="20" follows="top|left" + name="view_profile_btn" + label="View Profile" + font="SansSerif" + /> + <button + bottom="10" left="230" width="60" height="20" follows="top|left" + name="gear_btn" + label="" + image_overlay="gear.tga" + image_overlay_alignment="center" + scale_image="true" + /> +</floater> diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml index 76c132aeb7..951cf63c76 100644 --- a/indra/newview/skins/default/xui/en/menu_favorites.xml +++ b/indra/newview/skins/default/xui/en/menu_favorites.xml @@ -21,7 +21,7 @@ parameter="about" /> </menu_item_call> <menu_item_call - label="Copy SLURL" + label="Copy SLurl" layout="topleft" name="Copy slurl"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml index 9263f75d24..64fec3ab40 100644 --- a/indra/newview/skins/default/xui/en/menu_landmark.xml +++ b/indra/newview/skins/default/xui/en/menu_landmark.xml @@ -6,7 +6,7 @@ name="landmark_overflow_menu" width="128"> <menu_item_call - label="Copy SLURL" + label="Copy SLurl" layout="topleft" name="copy"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 46d13cdc0b..1e911c2664 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -81,8 +81,7 @@ function="Advanced.ShowDebugSettings" parameter="skin" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> + <menu_item_separator /> <menu_item_call label="UI Preview Tool" layout="topleft" @@ -92,7 +91,8 @@ function="ShowFloater" parameter="ui_preview" /> </menu_item_call> - <menu_item_call + <menu_item_separator /> + <menu_item_call label="Widget Test" layout="topleft" name="Widget Test" @@ -102,12 +102,12 @@ parameter="test_widgets" /> </menu_item_call> <menu_item_call - label="List View Test" - name="List View Test" - shortcut="control|shift|L"> + label="Avatar Inspector" + name="Avatar Inspector" + shortcut="control|shift|I"> <menu_item_call.on_click function="ShowFloater" - parameter="test_list_view" /> + parameter="inspect_avatar" /> </menu_item_call> <menu_item_call label="Show TOS" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 5e894e1773..352ec79385 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2277,219 +2277,6 @@ layout="topleft" name="Rendering" tear_off="true"> - <menu - create_jump_keys="true" - label="Info Displays" - layout="topleft" - name="Info Displays" - tear_off="true"> - <menu_item_check - label="Verify" - layout="topleft" - name="Verify"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="verify" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="verify" /> - </menu_item_check> - <menu_item_check - label="BBoxes" - layout="topleft" - name="BBoxes"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="bboxes" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="bboxes" /> - </menu_item_check> - <menu_item_check - label="Points" - layout="topleft" - name="Points"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="points" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="points" /> - </menu_item_check> - <menu_item_check - label="Octree" - layout="topleft" - name="Octree"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="octree" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="octree" /> - </menu_item_check> - <menu_item_check - label="Shadow Frusta" - layout="topleft" - name="Shadow Frusta"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="shadow frusta" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="shadow frusta" /> - </menu_item_check> - <menu_item_check - label="Occlusion" - layout="topleft" - name="Occlusion"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="occlusion" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="occlusion" /> - </menu_item_check> - <menu_item_check - label="Render Batches" - layout="topleft" - name="Render Batches"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="render batches" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="render batches" /> - </menu_item_check> - <menu_item_check - label="Animated Textures" - layout="topleft" - name="Animated Textures"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="texture anim" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="texture anim" /> - </menu_item_check> - <menu_item_check - label="Texture Priority" - layout="topleft" - name="Texture Priority"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="texture priority" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="texture priority" /> - </menu_item_check> - <menu_item_check - label="Avatar Rendering Cost" - layout="topleft" - name="Avatar Rendering Cost"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="shame" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="shame" /> - </menu_item_check> - <menu_item_check - label="Texture Area (sqrt(A))" - layout="topleft" - name="Texture Area (sqrt(A))"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="texture area" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="texture area" /> - </menu_item_check> - <menu_item_check - label="Face Area (sqrt(A))" - layout="topleft" - name="Face Area (sqrt(A))"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="face area" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="face area" /> - </menu_item_check> - <menu_item_check - label="Lights" - layout="topleft" - name="Lights"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="lights" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="lights" /> - </menu_item_check> - <menu_item_check - label="Particles" - layout="topleft" - name="Particles"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="particles" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="particles" /> - </menu_item_check> - <menu_item_check - label="Composition" - layout="topleft" - name="Composition"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="composition" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="composition" /> - </menu_item_check> - <menu_item_check - label="Glow" - layout="topleft" - name="Glow"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="glow" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="glow" /> - </menu_item_check> - <menu_item_check - label="Show Depth Buffer" - layout="topleft" - name="Show Depth Buffer"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="ShowDepthBuffer" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="ShowDepthBuffer" /> - </menu_item_check> - <menu_item_check - label="Pick Render" - layout="topleft" - name="Pick Render"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="picking" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="picking" /> - </menu_item_check> - <menu_item_call - label="Vectorize Perf Test" - layout="topleft" - name="Vectorize Perf Test"> - <menu_item_call.on_click - function="Advanced.VectorizePerfTest" - parameter="" /> - </menu_item_call> - </menu> <menu_item_check label="Axes" layout="topleft" @@ -2702,13 +2489,6 @@ parameter="html_simple.http://www.secondlife.com" /> </menu_item_call> <menu_item_call - label="Buy Currency Test" - layout="topleft" - name="Buy Currency Test"> - <menu_item_call.on_click - function="Advanced.BuyCurrencyTest" /> - </menu_item_call> - <menu_item_call label="UI/Color Settings" layout="topleft" name="UI/Color Settings"> @@ -2860,7 +2640,6 @@ <menu create_jump_keys="true" label="XUI" - layout="topleft" name="XUI" tear_off="true"> <menu_item_call @@ -2909,6 +2688,15 @@ <menu_item_call.on_click function="Advanced.SendTestIMs" /> </menu_item_call> + <!-- *HACK: Hard code James Tester's UUID --> + <menu_item_call + label="Avatar Inspector" + name="Avatar Inspector" + shortcut="control|shift|I"> + <menu_item_call.on_click + function="Advanced.AvatarInspector" + parameter="22df1dcb-810a-4975-aab9-0159958fe155" /> + </menu_item_call> </menu> <menu create_jump_keys="true" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 216627879e..98c9ec868a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1041,7 +1041,7 @@ Do you wish to visit [_URL] for more information? type="alertmodal"> Your system contains a graphics card that is unknown to [APP_NAME] at this time. This is often the case with new hardware that hasn't been tested yet with [APP_NAME]. [APP_NAME] will most likely run properly, but you may need to adjust your graphics settings to something more appropriate. -(Edit menu > Preferences > Graphics). +(Me > Preferences > Graphics). <form name="form"> <ignore name="ignore" text="My graphics card could not be identified"/> @@ -1680,7 +1680,7 @@ No Group selected. type="alertmodal"> Unable to deed land: Cannot find the region this land is in. -Please use Tools -> Report Bug to report this. +Please use Help > Report Bug to report this. </notification> <notification @@ -1762,7 +1762,7 @@ Parcels you own appear in green. Unable to abandon land: Cannot find the region this land is in. -Please use Tools -> Report Bug to report this. +Please use Help > Report Bug to report this. </notification> <notification @@ -1836,7 +1836,7 @@ Divide land? Unable to divide land: Cannot find the region this land is in. -Please use Tools -> Report Bug to report this. +Please use Help > Report Bug to report this. </notification> <notification @@ -1846,7 +1846,7 @@ Please use Tools -> Report Bug to report this. Unable to join land: Cannot find the region this land is in. -Please use Tools -> Report Bug to report this. +Please use Help > Report Bug to report this. </notification> <notification @@ -1963,8 +1963,7 @@ Unable to save '[NAME]' to wearable file. You will need to free up so Unable to save [NAME] to central asset store. This is usually a temporary failure. Please customize and save the wearable again in a few minutes. -If this problem persists, please click on the 'Tools > Report Bug' pull down menu -and provide details about your network setup. +If this problem persists, please click on Help > Report Bug and provide details about your network setup. </notification> <notification @@ -2629,9 +2628,9 @@ This update is not required, but we suggest you install it to improve performanc icon="alertmodal.tga" name="DownloadLinuxMandatory" type="alertmodal"> -A new version of [SECOND_LIFE] is available. +A new version of [APP_NAME] is available. [MESSAGE] -You must download this update to use [SECOND_LIFE]. +You must download this update to use [APP_NAME]. <usetemplate name="okcancelbuttons" notext="Quit" @@ -2642,7 +2641,7 @@ You must download this update to use [SECOND_LIFE]. icon="alertmodal.tga" name="DownloadLinux" type="alertmodal"> -An updated version of [SECOND_LIFE] is available. +An updated version of [APP_NAME] is available. [MESSAGE] This update is not required, but we suggest you install it to improve performance and stability. <usetemplate @@ -2655,7 +2654,7 @@ This update is not required, but we suggest you install it to improve performanc icon="alertmodal.tga" name="DownloadLinuxReleaseForDownload" type="alertmodal"> -An updated version of [SECOND_LIFE] is available. +An updated version of [APP_NAME] is available. [MESSAGE] This update is not required, but we suggest you install it to improve performance and stability. <usetemplate @@ -3333,7 +3332,7 @@ You are not allowed in that region due to your maturity Rating. type="alertmodal"> You are not allowed in that Region due to your maturity Rating preference. -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit > Preferences... > General. +You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. <form name="form"> <button index="0" @@ -3390,7 +3389,7 @@ You cannot claim this land due to your maturity Rating. type="alertmodal"> You cannot claim this land due to your maturity Rating preference. -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit > Preferences... > General. +You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. <usetemplate name="okcancelignore" yestext="Change Preference" @@ -3440,7 +3439,7 @@ You cannot buy this land due to your maturity Rating. type="alertmodal"> You cannot buy this land due to your maturity Rating preference. -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit > Preferences... > General. +You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. <usetemplate name="okcancelignore" yestext="Change Preference" @@ -3769,7 +3768,7 @@ Default: off label="Top Colliders" name="HelpRegionTopColliders" type="alertmodal"> -Show a list of objects experiencing the greatest number of potential object-object collisions. These objects can slow performance. Select View > Statistics Bar and look under Simulator > Time > Sim Time (Physics) to see if more than 20 ms is being spent in physics. +Show a list of objects experiencing the greatest number of potential object-object collisions. These objects can slow performance. Select Advanced > Performance Tools > Statistics Bar and look under Simulator > Time > Physics Time to see if more than 20 ms is being spent in physics. </notification> <notification @@ -3778,7 +3777,7 @@ Show a list of objects experiencing the greatest number of potential object-obje name="HelpRegionTopScripts" type="alertmodal"> Show a list of objects spending the most time running LSL scripts. These objects can slow performance. -Select View > Statistics Bar and look under Simulator > Time > Script Time to see if more than 25 ms is being spent in scripts. +Select Advanced > Performance Tools > Statistics Bar and look under Simulator > Time > Script Time to see if more than 25 ms is being spent in scripts. </notification> <notification @@ -4437,7 +4436,7 @@ Are you sure you want to permanently delete the contents of your Trash? icon="alertmodal.tga" name="ConfirmClearBrowserCache" type="alertmodal"> -Delete your travel, web, and search history? +Are you sure you want to delete your travel, web, and search history? <usetemplate name="okcancelbuttons" notext="Cancel" @@ -6561,5 +6560,12 @@ Yes <global name="PermNo"> No </global> +<!-- this is alert string from server. the name needs to match entire the server string, and needs to be changed + whenever the server string changes --> + <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> +If you own a piece of land, you can make it your home location. +Otherwise, you can look at the Map and find places marked "Infohub". + </global> + </notifications> diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 28cb3bc551..291803fbc5 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -2,13 +2,31 @@ <panel background_visible="true" bevel_style="in" - height="640" + height="420" label="Edit Pick" layout="topleft" left="0" name="panel_edit_pick" top="0" - width="305"> + width="255"> + <scroll_container + color="DkGray2" + follows="left|top|right|bottom" + height="300" + layout="topleft" + left="0" + name="profile_scroll" + reserve_scroll_corner="true" + opaque="true" + width="255"> + <panel + name="scroll_content_panel" + follows="left|top|right" + layout="topleft" + top="0" + left="0" + width="240" + height="575"> <text type="string" length="1" @@ -81,7 +99,7 @@ name="pick_name" right="-10" text_color="black" - width="290" /> + width="255" /> <text type="string" length="1" @@ -144,15 +162,16 @@ name="set_to_curr_location_btn" width="200" /> </panel> + </panel> + </scroll_container> <panel - follows="right|bottom" + follows="left|right|bottom" height="25" label="bottom_panel" layout="topleft" - left="5" + left="10" name="bottom_panel" - top="605" - right="-10"> + top_pad="2"> <button follows="bottom|left" height="20" diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index c870e24e59..f93979d70d 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -4,14 +4,32 @@ background_visible="true" bevel_style="in" follows="left|top|right|bottom" - height="690" + height="420" label="Profile Edit" layout="topleft" left="10" mouse_opaque="true" name="edit_profile_panel" top="10" - width="305"> + width="255"> + <scroll_container + color="DkGray2" + follows="left|top|right|bottom" + height="300" + layout="topleft" + left="0" + name="profile_scroll" + reserve_scroll_corner="true" + opaque="true" + width="255"> + <panel + name="scroll_content_panel" + follows="left|top|right" + layout="topleft" + top="0" + left="0" + width="240" + height="575"> <text top="16" left="11" @@ -33,7 +51,7 @@ left="9" name="data_panel" top_pad="10" - width="280"> + width="260"> <text top_pad="5" left="9" @@ -84,12 +102,12 @@ left="0" name="2nd_life_pic" top_pad="5" - width="105" /> + width="125" /> </panel> <panel height="120" layout="topleft" - left_pad="0" + left_pad="10" name="first_life_image_panel" top="0" width="125"> @@ -116,7 +134,7 @@ left="0" name="real_world_pic" top_pad="5" - width="105" /> + width="125" /> </panel> <icon height="16" @@ -148,7 +166,7 @@ name="title_sl_descr_text" text_color="white" top_pad="10" - width="250"> + width="220"> [SECOND_LIFE] description: </text> <text_editor @@ -161,7 +179,7 @@ left="9" name="sl_description_edit" text_color="0.1 0.1 0.1 1" - width="265" + width="220" word_wrap="true"> </text_editor> <text @@ -175,7 +193,7 @@ name="title_rw_descr_text" text_color="white" top_pad="10" - width="250"> + width="220"> Real World description: </text> <text_editor @@ -188,7 +206,7 @@ left="9" name="fl_description_edit" text_color="0.1 0.1 0.1 1" - width="265" + width="220" word_wrap="true"> </text_editor> <text @@ -214,7 +232,7 @@ left="9" name="homepage_edit" text_color="0.2 0.2 1 1" - width="265"> + width="220"> TODO </line_editor> <check_box @@ -228,16 +246,18 @@ text_enabled_color="white" top_pad="10" width="250"/> + </panel> </panel> + </scroll_container> <panel - follows="bottom|right" + follows="bottom|left" height="30" left="10" name="profile_me_buttons_panel" - top_pad="8" - width="250"> + top_pad="10" + width="240"> <button - follows="bottom|right" + follows="bottom|left" font="SansSerifSmallBold" height="25" label="Save Changes" @@ -247,7 +267,7 @@ top="0" width="130" /> <button - follows="bottom|right" + follows="bottom|left" font="SansSerifSmallBold" height="25" label="Cancel" @@ -258,3 +278,6 @@ width="105" /> </panel> </panel> + + + diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 41294259e3..794b69d7ed 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -120,7 +120,7 @@ layout="topleft" left="32" name="start_location_text" - top="574" + top="576" width="95"> Start Location: </text> @@ -133,7 +133,7 @@ left_pad="2" max_chars="128" name="start_location_combo" - top_delta="0" + top_delta="-2" width="155"> <combo_box.item label="My Last Location" @@ -154,9 +154,9 @@ height="16" label="Remember password" layout="topleft" - left_pad="8" + left_pad="10" name="remember_check" - top_delta="0" + top_delta="3" width="138" /> <button follows="left|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index c8bde77a94..80fa99c257 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -2,12 +2,30 @@ <panel bevel_style="in" follows="left|top|right|bottom" - height="480" + height="420" layout="topleft" left="0" name="panel_pick_info" top="0" - width="265"> + width="255"> + <scroll_container + color="DkGray2" + follows="left|top|right|bottom" + height="300" + layout="topleft" + left="0" + name="profile_scroll" + reserve_scroll_corner="true" + opaque="true" + width="255"> + <panel + name="scroll_content_panel" + follows="left|top|right" + layout="topleft" + top="0" + left="0" + width="240" + height="575"> <text follows="top" font="SansSerifHugeBold" @@ -16,41 +34,29 @@ left="10" name="title" text_color="white" - top="16" + top="5" value="Pick Info" width="150" /> <button follows="top|right" - height="25" + height="20" image_overlay="BackArrow_Off" layout="topleft" name="back_btn" picture_style="true" - right="-11" - top="16" - width="25" - tab_stop="false" /> - - <scroll_container - color="DkGray2" - follows="left|top|right|bottom" - height="400" - layout="topleft" - left="0" - name="pick_info_scroll" - opaque="true" - reserve_scroll_corner="true" - width="265"> + right="-20" + top="7" + width="20" /> <panel background_visible="true" bg_alpha_color="DkGray2" - follows="left|right|top" + follows="left|right|top|bottom" height="550" layout="topleft" left="0" - min_height="550" - top_pad="0" - width="263"> + min_height="300" + top="30" + width="255"> <texture_picker enabled="false" follows="left|top|right" @@ -100,7 +106,7 @@ text_color="white" valign="center" value="[description]" - width="260" + width="255" word_wrap="true" /> <text follows="left|top" @@ -122,14 +128,7 @@ text_color="white" valign="center" value="[loading...]" /> - <icon - follows="top|left" - height="15" - image_name="" - layout="topleft" - mouse_opaque="true" - name="maturity" - width="15" /> + </panel> </panel> </scroll_container> <panel diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 5d0af26af5..01f0a84e13 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -64,23 +64,22 @@ reserve_scroll_corner="true" opaque="true" width="255"> - <panel - name="scroll_content_panel" - follows="left|top|right" - layout="topleft" - top="0" - left="0" - width="240" - height="520"> - - <panel - follows="left|top" - height="125" - layout="topleft" - left="10" - name="second_life_image_panel" - top="10" - width="260"> + <panel + name="scroll_content_panel" + follows="left|top|right" + layout="topleft" + top="0" + left="0" + width="240" + height="780"> + <panel + follows="left|top" + height="125" + layout="topleft" + left="10" + name="second_life_image_panel" + top="10" + width="260"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -254,10 +253,10 @@ follows="left|top" height="70" layout="topleft" - left_pad="8" + left="12" name="busy_response" - top_delta="0" - width="330" + top_pad="5" + width="250" word_wrap="true"> log_in_to_change </text_editor> @@ -361,12 +360,9 @@ word_wrap="true"> Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> - - - </panel> - - </scroll_container> - <panel + </panel> + </scroll_container> + <panel follows="bottom|left" height="30" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index e710774232..32223d542d 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -2,7 +2,7 @@ <panel background_visible="true" follows="all" - height="550" + height="660" layout="topleft" min_height="350" min_width="240" @@ -40,53 +40,33 @@ tab_stop="false" top="0" width="25" /> - <layout_stack - name="layout_stack" - orientation="vertical" + <tab_container + follows="left|top|right|bottom" + height="660" + layout="topleft" + left="10" + name="tabs" + tab_min_width="75" + tab_position="top" + top_pad="15" + width="285"> + <panel + class="panel_profile" + filename="panel_profile.xml" + label="Profile" + layout="topleft" + name="panel_profile" /> + <panel + class="panel_picks" + filename="panel_picks.xml" + label="Picks" + layout="topleft" + name="panel_picks" /> + <panel + class="panel_notes" + filename="panel_notes.xml" + label="Notes & Privacy" layout="topleft" - follows="all" - left="0" - top="50" - height="500" - width="305" - border_size="0"> - <panel - name="stack_panel" - follows="all" - layout="topleft" - top="0" - left="0" - height="500" - width="305"> - <tab_container - follows="all" - height="500" - layout="topleft" - left="10" - name="tabs" - tab_min_width="75" - tab_position="top" - top="0" - width="280"> - <panel - class="panel_profile" - filename="panel_profile.xml" - label="Profile" - layout="topleft" - name="panel_profile" /> - <panel - class="panel_picks" - filename="panel_picks.xml" - label="Picks" - layout="topleft" - name="panel_picks" /> - <panel - class="panel_notes" - filename="panel_notes.xml" - label="Notes & Privacy" - layout="topleft" - name="panel_notes" /> - </tab_container> - </panel> - </layout_stack> + name="panel_notes" /> + </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index ee52184119..c905e0e42c 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -10,6 +10,7 @@ <scroll_container follows="top|left|right|bottom" height="508" + name="container1" layout="topleft" width="280"> <panel diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml index 8e8fc9ef7f..5285a53c59 100644 --- a/indra/newview/skins/default/xui/en/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml @@ -3,12 +3,14 @@ border="true" follows="top|left" height="512" + name="TextureWrapper" label="Ground Textures" layout="topleft" width="280"> <scroll_container follows="top|left|right|bottom" height="508" + name="container1" layout="topleft" width="280"> <panel diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index df328118a2..4560a7138c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -944,16 +944,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> - [SECOND_LIFE_VIEWER] Update + [APP_NAME] Update </string> <string name="UpdaterNowUpdating"> - Now updating [SECOND_LIFE_VIEWER]... + Now updating [APP_NAME]... </string> <string name="UpdaterNowInstalling"> - Installing [SECOND_LIFE_VIEWER]... + Installing [APP_NAME]... </string> <string name="UpdaterUpdatingDescriptive"> - Your [SECOND_LIFE_VIEWER] Viewer is being updated to the latest release. This may take some time, so please be patient. + Your [APP_NAME] Viewer is being updated to the latest release. This may take some time, so please be patient. </string> <string name="UpdaterProgressBarTextWithEllipses"> Downloading update... @@ -965,7 +965,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Failed to download update </string> <string name="UpdaterFailUpdateDescriptive"> - An error occurred while updating Second Life. Please download the latest version from www.secondlife.com. + An error occurred while updating [APP_NAME]. Please download the latest version from www.secondlife.com. </string> <string name="UpdaterFailInstallTitle"> Failed to install update @@ -973,5 +973,4 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="UpdaterFailStartTitle"> Failed to start viewer </string> - </strings> |