summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/colors.xml5
-rw-r--r--indra/newview/skins/default/xui/en/favorites_bar_button.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_widgets.xml6
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_controls.xml2
-rw-r--r--indra/newview/skins/default/xui/en/inspect_avatar.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_picks_plus.xml3
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml136
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_control_panel.xml164
-rw-r--r--indra/newview/skins/default/xui/en/panel_im_control_panel.xml213
-rw-r--r--indra/newview/skins/default/xui/en/panel_instant_message.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_main_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_me.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_my_profile.xml229
-rw-r--r--indra/newview/skins/default/xui/en/panel_notes.xml20
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfits_inventory.xml26
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml17
-rw-r--r--indra/newview/skins/default/xui/en/panel_prim_media_controls.xml243
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml204
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_view.xml6
23 files changed, 734 insertions, 569 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index cb511c2f0b..67816a6a87 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -64,7 +64,7 @@
value="0 0 1 1" />
<color
name="Yellow"
- value="0.114 0.65 0.1" />
+ value="1 1 0 1" />
<color
name="Green"
value="0 .39 .10 1" />
@@ -168,6 +168,9 @@
name="ChatHistoryTextColor"
reference="LtGray" />
<color
+ name="ChicletFlashColor"
+ reference="0.114 0.65 0.1" />
+ <color
name="ColorDropShadow"
reference="Black_50" />
<color
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 90105f92fd..dcf9847adb 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -23,8 +23,6 @@
pad_left="11"
pad_right="7"
tab_stop="false"
- pad_right="10"
- pad_left="10"
top="0"
use_ellipses="true"
width="140" />
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 57e92cdeec..243b63db00 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -14,8 +14,8 @@
visible="true"
width="360"
can_resize="true"
- min_width="360"
- min_height="350">
+ min_width="250"
+ min_height="190">
<layout_stack
follows="all"
height="320"
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 84adabe4fa..2f88c234cc 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -123,6 +123,12 @@
layout="topleft"
tool_tip="checkbox"
name="test_checkbox" />
+ <check_box
+ top_pad="5"
+ enabled="false"
+ label="Checkbox Disabled"
+ tool_tip="checkbox disabled"
+ name="test_checkbox_disabled" />
<!-- "combo_box" is a pop-menu of items. Optionally the box itself can
contain a general purpose line input editor, allowing the user to
provide input that is not a list item. -->
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 1fa613468f..a4ef807f06 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -30,7 +30,7 @@
</string>
<string
name="no_one_near">
- No one near
+ No one near has voice enabled
</string>
<string
name="max_visible_items">
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 2f2964c42b..a666b8a427 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -65,7 +65,7 @@
<slider
follows="top|left"
height="23"
- increment="0.05"
+ increment="0.01"
left="1"
max_val="0.95"
min_val="0.05"
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 01df208850..dde92f23b6 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -30,6 +30,8 @@
label="Call"
enabled="true"
name="call">
+ <menu_item_call.on_click
+ function="InspectAvatar.Call"/>
</menu_item_call>
<menu_item_call
label="Teleport"
diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
index 3065239615..f3b207e36c 100644
--- a/indra/newview/skins/default/xui/en/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
@@ -11,6 +11,9 @@
<menu_item_call.on_click
function="Picks.Plus.Action"
userdata="new_pick" />
+ <menu_item_call.on_enable
+ function="Picks.Plus.Enable"
+ userdata="new_pick" />
</menu_item_call>
<menu_item_call
name="create_classified"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 95a7374e7b..6d5f0bedb0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5087,6 +5087,14 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
<notification
icon="notify.tga"
+ name="TeleportOfferSent"
+ type="offer">
+ Teleport offer sent to [TO_NAME]
+ </notification>
+
+
+ <notification
+ icon="notify.tga"
name="GotoURL"
type="notify">
[MESSAGE]
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index f3a2297151..6c54532a3a 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -5,56 +5,94 @@
height="215"
name="panel_im_control_panel"
width="180">
- <avatar_list
- color="DkGray2"
+ <layout_stack
+ mouse_opaque="false"
+ border_size="0"
+ clip="false"
follows="all"
- height="130"
- ignore_online_status="true"
+ height="215"
layout="topleft"
left="3"
- name="speakers_list"
- opaque="false"
- show_info_btn="false"
- show_profile_btn="false"
- show_speaking_indicator="false"
- top="10"
- width="180" />
- <panel
- background_visible="true"
- bg_alpha_color="DkGray2"
- border="false"
- bottom="1"
- follows="left|right|bottom"
- height="70"
- left="0"
- left_pad="0"
- name="panel_call_buttons"
- top_pad="0"
- width="180">
- <button
- bottom="10"
- follows="all"
- height="20"
- label="Call"
- left_delta="10"
- name="call_btn"
- width="160" />
- <button
- bottom="40"
- follows="all"
- height="20"
- label="Leave Call"
- name="end_call_btn"
- visible="false"
- />
- <button
- follows="all"
- bottom="10"
- height="20"
- label="Voice Controls"
- name="voice_ctrls_btn"
- use_ellipses="true"
- visible="false"
- />
- </panel>
+ name="vertical_stack"
+ orientation="vertical"
+ top="0"
+ width="177">
+ <layout_panel
+ auto_resize="true"
+ follows="top|left"
+ height="130"
+ layout="topleft"
+ min_height="0"
+ mouse_opaque="false"
+ width="180"
+ top="0"
+ name="speakers_list_panel"
+ user_resize="false">
+ <avatar_list
+ color="DkGray2"
+ follows="all"
+ height="130"
+ ignore_online_status="true"
+ layout="topleft"
+ name="speakers_list"
+ opaque="false"
+ show_info_btn="false"
+ show_profile_btn="false"
+ show_speaking_indicator="false"
+ width="180" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="160"
+ name="call_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="all"
+ height="20"
+ label="Call"
+ name="call_btn"
+ width="160"
+ top="5" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="160"
+ name="end_call_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="all"
+ height="20"
+ label="Leave Call"
+ name="end_call_btn"
+ top="5"/>
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="160"
+ name="voice_ctrls_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="all"
+ height="20"
+ label="Voice Controls"
+ name="voice_ctrls_btn"
+ top="5"
+ use_ellipses="true" />
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index b92aa10ffc..aeaa049f1f 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -350,7 +350,7 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
-->
<button
auto_resize="true"
- flash_color="Yellow"
+ flash_color="ChicletFlashColor"
follows="right"
halign="center"
height="23"
@@ -403,7 +403,7 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
halign="center"
height="23"
follows="right"
- flash_color="Yellow"
+ flash_color="ChicletFlashColor"
label_color="Black"
left="5"
name="Unread"
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 86b30ebfce..4073ef158b 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -5,66 +5,110 @@
height="238"
name="panel_im_control_panel"
width="180">
- <avatar_list
- color="DkGray2"
+ <layout_stack
+ mouse_opaque="false"
+ border_size="0"
+ clip="false"
follows="all"
- height="100"
- ignore_online_status="true"
+ height="238"
layout="topleft"
- left="3"
- name="speakers_list"
- opaque="false"
- show_info_btn="false"
- show_profile_btn="false"
- show_speaking_indicator="false"
- top="10"
- width="180" />
- <button
- bottom_pad="0"
- follows="left|right|bottom"
- height="23"
- label="Group Profile"
- left_delta="10"
- name="group_info_btn"
- use_ellipses="true"
- width="160" />
- <panel
- background_visible="true"
- bg_alpha_color="DkGray2"
- border="false"
- follows="left|right|bottom"
- height="70"
- left="0"
- left_pad="0"
- name="panel_call_buttons"
- top_pad="0"
- width="180">
- <button
- bottom="10"
- follows="all"
- height="23"
- label="Call Group"
- left_delta="10"
- name="call_btn"
- use_ellipses="true"
- width="160" />
- <button
- bottom="40"
- follows="all"
- height="23"
- label="Leave Call"
- name="end_call_btn"
- use_ellipses="true"
- visible="false"
- />
- <button
- bottom="10"
- follows="all"
- height="23"
- label="Open Voice Controls"
- name="voice_ctrls_btn"
- use_ellipses="true"
- visible="false"
- />
- </panel>
+ left="5"
+ name="vertical_stack"
+ orientation="vertical"
+ top="0"
+ width="175">
+ <layout_panel
+ auto_resize="true"
+ follows="top|left"
+ height="100"
+ layout="topleft"
+ min_height="0"
+ mouse_opaque="false"
+ width="180"
+ top="0"
+ name="speakers_list_panel"
+ user_resize="false">
+ <avatar_list
+ color="DkGray2"
+ follows="all"
+ height="100"
+ ignore_online_status="true"
+ layout="topleft"
+ name="speakers_list"
+ opaque="false"
+ show_info_btn="false"
+ show_profile_btn="false"
+ show_speaking_indicator="false"
+ width="180" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="28"
+ layout="topleft"
+ min_height="28"
+ width="160"
+ name="group_info_btn_panel"
+ user_resize="false">
+ <button
+ follows="left|right|bottom"
+ height="23"
+ label="Group Profile"
+ name="group_info_btn"
+ use_ellipses="true"
+ top="5"
+ width="160" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="28"
+ layout="topleft"
+ min_height="28"
+ width="160"
+ name="call_btn_panel"
+ user_resize="false">
+ <button
+ follows="all"
+ height="23"
+ label="Call Group"
+ name="call_btn"
+ use_ellipses="true"
+ width="160" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="28"
+ layout="topleft"
+ min_height="28"
+ width="160"
+ name="end_call_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="all"
+ height="23"
+ label="Leave Call"
+ name="end_call_btn"
+ use_ellipses="true" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="28"
+ layout="topleft"
+ min_height="28"
+ width="160"
+ name="voice_ctrls_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="all"
+ height="23"
+ label="Open Voice Controls"
+ name="voice_ctrls_btn"
+ use_ellipses="true" />
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 30e652befd..2e3d5a7320 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -6,84 +6,161 @@
width="110">
<avatar_icon
follows="left|top"
- height="100"
+ height="105"
left_delta="5"
name="avatar_icon"
top="-5"
- width="100"/>
+ width="105"/>
<text
follows="top|left|right"
font="SansSerifLarge"
- height="22"
+ height="19"
layout="topleft"
name="avatar_name"
use_ellipses="true"
value="Unknown"
- width="100" />
- <button
- follows="left|top|right"
- height="20"
- label="Profile"
- name="view_profile_btn"
- width="100" />
- <button
- follows="left|top|right"
- height="20"
- label="Add Friend"
- name="add_friend_btn"
- width="100" />
- <button
- follows="left|top|right"
- height="20"
- label="Teleport"
- name="teleport_btn"
- width="100" />
- <button
- follows="left|top|right"
- height="20"
- label="Share"
- name="share_btn"
- width="100" />
- <!--Removing pay button to save space - will update spec - verified by Erica/Steve -->
- <!-- <button
- follows="left|top|right"
- height="20"
- label="Pay"
- name="pay_btn"
- width="100" />-->
- <panel
- background_visible="true"
- bg_alpha_color="DkGray2"
- border="false"
- top_pad="10"
- follows="left|bottom|right"
- height="70"
- left="1"
- name="panel_call_buttons"
- width="109">
- <button
- bottom="10"
- follows="left|top|right"
- height="20"
- label="Call"
- left_delta="5"
- name="call_btn"
- width="100" />
- <button
- bottom="35"
- follows="left|top|right"
+ width="110" />
+ <layout_stack
+ mouse_opaque="false"
+ border_size="0"
+ clip="false"
+ follows="all"
+ height="168"
+ layout="topleft"
+ left="5"
+ name="button_stack"
+ orientation="vertical"
+ top_pad="0"
+ width="105">
+ <layout_panel
+ mouse_opaque="false"
+ auto_resize="true"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="2"
+ min_height="0"
+ width="100"
+ top="0"
+ name="spacer"
+ user_resize="false" />
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
height="20"
- label="Leave Call"
- name="end_call_btn"
- visible="false"
- width="100" />
+ layout="topleft"
+ min_height="20"
+ width="100"
+ name="view_profile_btn_panel"
+ user_resize="false">
+ <button
+ follows="left|top|right"
+ height="20"
+ label="Profile"
+ name="view_profile_btn"
+ top="0"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="add_friend_btn_panel"
+ user_resize="false">
+ <button
+ follows="left|top|right"
+ height="20"
+ label="Add Friend"
+ name="add_friend_btn"
+ top="5"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="teleport_btn_panel"
+ user_resize="false">
<button
- bottom="10"
- follows="left|top|right"
- height="20"
- label="Voice Controls"
- name="voice_ctrls_btn"
- visible="false"
- width="100" />
- </panel>
+ auto_resize="false"
+ follows="left|top|right"
+ height="20"
+ label="Teleport"
+ name="teleport_btn"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="share_btn_panel"
+ user_resize="false">
+ <button
+ auto_resize="true"
+ follows="left|top|right"
+ height="20"
+ label="Share"
+ name="share_btn"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="call_btn_panel"
+ user_resize="false">
+ <button
+ follows="left|top|right"
+ height="20"
+ label="Call"
+ name="call_btn"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="end_call_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="left|top|right"
+ height="20"
+ label="Leave Call"
+ name="end_call_btn"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="voice_ctrls_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="left|top|right"
+ height="20"
+ label="Voice Controls"
+ name="voice_ctrls_btn"
+ width="100" />
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index ccd754ac5e..7204e57479 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -21,6 +21,7 @@
label="im_header"
layout="topleft"
left="5"
+ mouse_opaque="false"
name="im_header"
top="5"
width="295">
@@ -30,7 +31,7 @@
image_name="Generic_Person"
layout="topleft"
left="3"
- mouse_opaque="true"
+ mouse_opaque="false"
name="avatar_icon"
top="3"
width="18" />
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d7792696e7..9d00abd2c9 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -208,7 +208,7 @@ halign="center"
layout="topleft"
name="Reset Current">
<menu_item_call.on_click
- function="Inventory.ResetFilter" />
+ function="Inventory.ResetFilters" />
</menu_item_call>
<menu_item_call
label="Close All Folders"
diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml
index a99777848b..e779e37419 100644
--- a/indra/newview/skins/default/xui/en/panel_me.xml
+++ b/indra/newview/skins/default/xui/en/panel_me.xml
@@ -26,7 +26,7 @@
</text> -->
<tab_container
follows="all"
- height="575"
+ height="570"
halign="center"
layout="topleft"
left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 10381d3987..12a0a9155d 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -31,32 +31,49 @@
name="RegisterDateFormat">
[REG_DATE] ([AGE])
</string>
- <scroll_container
- color="DkGray2"
+ <layout_stack
+ name="layout"
+ orientation="vertical"
follows="all"
- height="485"
layout="topleft"
- name="profile_scroll"
- reserve_scroll_corner="false"
- opaque="true"
+ left="0"
top="0"
- width="313">
+ height="535"
+ width="313"
+ border_size="0">
<panel
- name="scroll_content_panel"
- follows="left|top|right"
- height="485"
+ name="profile_stack"
+ follows="all"
layout="topleft"
top="0"
left="0"
- width="297">
- <panel
- follows="left|top"
+ height="505"
+ width="313">
+ <scroll_container
+ color="DkGray2"
+ follows="all"
+ layout="topleft"
+ left="0"
+ name="profile_scroll"
+ opaque="true"
+ height="505"
+ width="313"
+ top="0">
+ <panel
+ layout="topleft"
+ follows="left|top|right"
+ name="scroll_content_panel"
+ top="0"
+ left="0"
+ width="303">
+ <panel
+ follows="left|top|right"
height="117"
layout="topleft"
left="10"
name="second_life_image_panel"
top="0"
- width="280">
+ width="300">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@@ -80,7 +97,7 @@
width="102" />
<text
follows="left|top|right"
- font.style="BOLD"
+ font.style="BOLD"
height="15"
layout="topleft"
left_pad="10"
@@ -88,7 +105,7 @@
text_color="white"
top_delta="0"
value="[SECOND_LIFE]:"
- width="165" />
+ width="180" />
<expandable_text
follows="left|top|right"
height="95"
@@ -97,20 +114,20 @@
textbox.max_length="512"
name="sl_description_edit"
top_pad="-3"
- width="173"
+ width="188"
expanded_bg_visible="true"
expanded_bg_color="DkGray">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
</expandable_text>
</panel>
<panel
- follows="left|top"
+ follows="left|top|right"
height="117"
layout="topleft"
- top_pad="10"
+ top_pad="10"
left="10"
name="first_life_image_panel"
- width="280">
+ width="300">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@@ -133,7 +150,7 @@
width="102" />
<text
follows="left|top|right"
- font.style="BOLD"
+ font.style="BOLD"
height="15"
layout="topleft"
left_pad="10"
@@ -141,7 +158,7 @@
text_color="white"
top_delta="0"
value="Real World:"
- width="165" />
+ width="180" />
<expandable_text
follows="left|top|right"
height="95"
@@ -150,90 +167,23 @@
textbox.max_length="512"
name="fl_description_edit"
top_pad="-3"
- width="173"
+ width="188"
expanded_bg_visible="true"
expanded_bg_color="DkGray">
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.
</expandable_text>
</panel>
-
-
- <!-- <panel
- name="lifes_images_panel"
- follows="left|top|right"
- height="244"
- layout="topleft"
- top="0"
- left="0"
- width="285">
- <panel
- follows="left|top"
- height="117"
- layout="topleft"
- left="10"
- name="second_life_image_panel"
- top="0"
- width="285">
- <text
- follows="left|top|right"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="0"
- name="second_life_photo_title_text"
- text_color="white"
- value="[SECOND_LIFE]:"
- width="170" />
- <texture_picker
- allow_no_texture="true"
- default_image_name="None"
- enabled="false"
- follows="top|left"
- height="117"
- layout="topleft"
- left="0"
- name="2nd_life_pic"
- top_pad="0"
- width="102" />
- </panel>
- <icon
- height="18"
- image_name="AddItem_Off"
- layout="topleft"
- name="2nd_life_edit_icon"
- label=""
- left="87"
- tool_tip="Click to select an image"
- top="25"
- width="18" />
- </panel> -->
-
-
-
-
- <text
- type="string"
- follows="left|top"
- font="SansSerifSmall"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="10"
- name="me_homepage_text"
- text_color="white"
- top_pad="0"
- width="280">
- Homepage:
- </text>
<text
follows="left|top"
height="15"
+ font.style="BOLD"
+ font="SansSerifMedium"
layout="topleft"
left="10"
name="homepage_edit"
top_pad="0"
value="http://librarianavengers.org"
- width="280"
+ width="300"
word_wrap="false"
use_ellipses="true"
/>
@@ -246,8 +196,8 @@
name="title_member_text"
text_color="white"
top_pad="10"
- value="Member Since:"
- width="280" />
+ value="Resident Since:"
+ width="300" />
<text
follows="left|top"
height="15"
@@ -255,7 +205,7 @@
left="10"
name="register_date"
value="05/31/2376"
- width="280"
+ width="300"
word_wrap="true" />
<text
follows="left|top"
@@ -265,9 +215,9 @@
left="10"
name="title_acc_status_text"
text_color="white"
- top_pad="10"
+ top_pad="5"
value="Account Status:"
- width="280" />
+ width="300" />
<!-- <text
type="string"
follows="left|top"
@@ -279,16 +229,18 @@
top_delta="0"
value="Go to Dashboard"
width="100"/> -->
- <text
+ <text
follows="left|top"
- height="20"
+ height="28"
layout="topleft"
left="10"
name="acc_status_text"
top_pad="0"
- value="Resident. No payment info on file."
- width="280"
- word_wrap="true" />
+ width="300"
+ word_wrap="true">
+ Resident. No payment info on file.
+Linden.
+ </text>
<text
follows="left|top"
font.style="BOLD"
@@ -297,9 +249,9 @@
left="10"
name="title_partner_text"
text_color="white"
- top_pad="5"
+ top_pad="3"
value="Partner:"
- width="280" />
+ width="300" />
<panel
follows="left|top"
height="15"
@@ -307,7 +259,7 @@
left="10"
name="partner_data_panel"
top_pad="0"
- width="280">
+ width="300">
<text
follows="left|top"
height="10"
@@ -316,44 +268,43 @@
name="partner_text"
top="0"
value="[FIRST] [LAST]"
- width="280"
+ width="300"
word_wrap="true" />
</panel>
<text
follows="left|top"
font.style="BOLD"
- height="15"
+ height="13"
layout="topleft"
left="10"
name="title_groups_text"
text_color="white"
- top_pad="8"
+ top_pad="3"
value="Groups:"
- width="280" />
- <expandable_text
- follows="left|top|bottom"
- height="60"
+ width="300" />
+ <expandable_text
+ follows="all"
+ height="113"
layout="topleft"
- left="10"
- name="sl_groups"
+ left="7"
+ name="sl_groups"
top_pad="0"
- width="280"
- expanded_bg_visible="true"
- expanded_bg_color="DkGray">
- 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.
+ width="298"
+ expanded_bg_visible="true"
+ expanded_bg_color="DkGray">
+ 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. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
</expandable_text>
- </panel>
+ </panel>
</scroll_container>
- <panel
+ </panel>
+<!-- <panel
follows="bottom|left"
layout="topleft"
left="0"
name="profile_buttons_panel"
- top_pad="2"
- bottom="10"
- height="23"
- width="303">
- <button
+ height="28"
+ width="313">
+ <button
follows="bottom|left"
height="23"
label="Add Friend"
@@ -361,8 +312,9 @@
left="0"
mouse_opaque="false"
name="add_friend"
+ tool_tip="Offer friendship to the resident"
top="5"
- width="75" />
+ width="80" />
<button
follows="bottom|left"
height="23"
@@ -370,7 +322,7 @@
layout="topleft"
name="im"
top="5"
- left_pad="5"
+ left_pad="3"
width="45" />
<button
follows="bottom|left"
@@ -378,7 +330,7 @@
label="Call"
layout="topleft"
name="call"
- left_pad="5"
+ left_pad="3"
top="5"
width="45" />
<button
@@ -389,7 +341,7 @@
layout="topleft"
name="show_on_map_btn"
top="5"
- left_pad="5"
+ left_pad="3"
width="45" />
<button
follows="bottom|left"
@@ -397,23 +349,24 @@
label="Teleport"
layout="topleft"
name="teleport"
- left_pad="5"
+ left_pad="3"
top="5"
- width="80" />
- </panel>
+ width="85" />
+ </panel>-->
<panel
follows="bottom|left"
layout="topleft"
left="0"
- top_pad="-17"
+ top_pad="0"
name="profile_me_buttons_panel"
visible="false"
- height="23"
- width="303">
+ height="28"
+ width="313">
<button
follows="bottom|right"
height="23"
- left="10"
+ left="20"
+ top="0"
label="Edit Profile"
name="edit_profile_btn"
tool_tip="Edit your personal information"
@@ -425,7 +378,7 @@
left_pad="10"
name="edit_appearance_btn"
tool_tip="Create/edit your appearance: physical data, clothes and etc."
- right="-10"
width="130" />
</panel>
+</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index f15e75dee9..9335db0623 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -115,14 +115,14 @@
<button
follows="bottom|left"
height="23"
- label="Add"
+ label="Add Friend"
layout="topleft"
left="0"
mouse_opaque="false"
name="add_friend"
tool_tip="Offer friendship to the resident"
top="5"
- width="55" />
+ width="80" />
<button
follows="bottom|left"
height="23"
@@ -131,8 +131,8 @@
name="im"
tool_tip="Open instant message session"
top="5"
- left_pad="5"
- width="40" />
+ left_pad="3"
+ width="45" />
<button
follows="bottom|left"
height="23"
@@ -140,9 +140,9 @@
layout="topleft"
name="call"
tool_tip="Call this resident"
- left_pad="5"
+ left_pad="3"
top="5"
- width="55" />
+ width="45" />
<button
enabled="false"
follows="bottom|left"
@@ -152,8 +152,8 @@
name="show_on_map_btn"
tool_tip="Show the resident on the map"
top="5"
- left_pad="5"
- width="50" />
+ left_pad="3"
+ width="45" />
<button
follows="bottom|left"
height="23"
@@ -161,9 +161,9 @@
layout="topleft"
name="teleport"
tool_tip="Offer teleport"
- left_pad="5"
+ left_pad="3"
top="5"
- width="90" />
+ width="80" />
</panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index d6d8e9562b..7e512f9594 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -21,19 +21,6 @@
tab_position="top"
halign="center"
width="313">
- <inventory_panel
- label="MY OUTFITS"
- help_topic="my_outfits_tab"
- allow_multi_select="true"
- follows="all"
- border="false"
- left="0"
- top="0"
- height="500"
- width="290"
- mouse_opaque="true"
- name="outfitslist_accordionpanel"
- start_folder="My Outfits" />
<inventory_panel
label="WEARING"
help_topic="now_wearing_tab"
@@ -46,6 +33,19 @@
mouse_opaque="true"
name="cof_accordionpanel"
start_folder="Current Outfit" />
+ <inventory_panel
+ label="MY OUTFITS"
+ help_topic="my_outfits_tab"
+ allow_multi_select="true"
+ follows="all"
+ border="false"
+ left="0"
+ top="0"
+ height="500"
+ width="290"
+ mouse_opaque="true"
+ name="outfitslist_accordionpanel"
+ start_folder="My Outfits" />
</tab_container>
<panel
background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
index 7b88fca7c3..2c7a51f0e7 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
@@ -18,17 +18,6 @@
parameter="wear" />
</menu_item_call>
<menu_item_call
- label="Add To Current Outfit"
- layout="topleft"
- name="add">
- <on_click
- function="panel_outfits_inventory_gear_default.Custom.Action"
- parameter="add" />
- <on_enable
- function="panel_outfits_inventory_gear_default.Enable"
- parameter="add" />
- </menu_item_call>
- <menu_item_call
label="Remove From Current Outfit"
layout="topleft"
name="remove">
@@ -54,7 +43,7 @@
parameter="rename" />
</menu_item_call>
<menu_item_call
- label="Remove"
+ label="Remove Link"
layout="topleft"
name="remove_link">
<on_click
@@ -65,7 +54,7 @@
parameter="remove_link" />
</menu_item_call>
<menu_item_call
- label="Delete"
+ label="Delete Outfit"
layout="topleft"
name="delete">
<on_click
@@ -73,6 +62,6 @@
parameter="delete" />
<on_enable
function="panel_outfits_inventory_gear_default.Enable"
- parameter="delete" />
+ parameter="delete_outfit" />
</menu_item_call>
</menu>
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 677d0de243..4cef1f9c60 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -1,54 +1,99 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="left|right|top|bottom"
- name="MediaControls"
+ name="MediaControlsPanel"
background_visible="false"
height="200"
layout="topleft"
help_topic="prim_media_controls"
mouse_opaque="false"
+ min_width="300"
width="800">
<string name="control_background_image_name">Inspector_Background</string>
<string name="skip_step">0.2</string>
- <string name="min_width">400</string>
- <string name="min_height">120</string>
+ <string name="min_width">300</string>
+ <string name="min_height">75</string>
<string name="zoom_near_padding">1.0</string>
<string name="zoom_medium_padding">1.25</string>
<string name="zoom_far_padding">1.5</string>
- <panel
- name="media_region"
- height="100"
- follows="left|right|top|bottom"
+ <string name="top_world_view_avoid_zone">50</string>
+ <layout_stack
+ name="progress_indicator_area"
+ follows="left|right|top"
+ height="8"
layout="topleft"
- mouse_opaque="false"
- top="0" />
+ animate="false"
+ left="0"
+ orientation="horizontal"
+ top="22">
+ <!-- outer layout_panels center the inner one -->
+ <layout_panel
+ width="0"
+ name="left_bookend_bottom"
+ mouse_opaque="false"
+ layout="topleft"
+ user_resize="false" />
+ <panel
+ name="media_progress_indicator"
+ mouse_opaque="false"
+ follows="left|right|top"
+ height="8"
+ layout="topleft"
+ left="0"
+ top="0"
+ auto_resize="false"
+ user_resize="false"
+ min_width="100"
+ width="200">
+ <progress_bar
+ name="media_progress_bar"
+ color_bg="1 1 1 1"
+ color_bar="1 1 1 0.96"
+ follows="left|right|top"
+ height="8"
+ layout="topleft"
+ top="0"
+ left="0"
+ tool_tip="Media is Loading"/>
+ </panel>
+ <layout_panel
+ name="right_bookend_bottom"
+ width="0"
+ mouse_opaque="false"
+ layout="topleft"
+ user_resize="false" />
+ </layout_stack>
<layout_stack
name="media_controls"
- follows="left|right"
+ follows="left|right|top"
animate="false"
height="75"
layout="topleft"
+ top="0"
left="0"
+ border_size="1"
mouse_opaque="false"
- orientation="horizontal"
- top="100">
+ orientation="horizontal">
<!-- outer layout_panels center the inner one -->
<layout_panel
name="left_bookend"
+ top="0"
width="0"
- mouse_opaque="false"
+ mouse_opaque="false"
layout="topleft"
user_resize="false" />
<layout_panel
name="back"
+ top="0"
auto_resize="false"
user_resize="false"
layout="topleft"
- mouse_opaque="false"
+ mouse_opaque="false"
min_width="22"
- width="22"
- top="4">
+ width="22">
<button
+ name="back_btn"
+ follows="top"
image_overlay="Arrow_Left_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
@@ -56,12 +101,12 @@
image_unselected="PushButton_Off"
hover_glow_amount="0.15"
auto_resize="false"
- height="22"
layout="topleft"
tool_tip="Navigate back"
- width="22"
+ top="0"
left="0"
- top_delta="4">
+ width="22"
+ height="22">
<button.commit_callback
function="MediaCtrl.Back" />
</button>
@@ -71,22 +116,24 @@
auto_resize="false"
user_resize="false"
layout="topleft"
- top="10"
min_width="22"
+ top="0"
+ height="22"
width="22">
<button
+ follows="top"
image_overlay="Arrow_Right_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
hover_glow_amount="0.15"
+ top="0"
height="22"
- layout="topleft"
- tool_tip="Navigate forward"
- top_delta="0"
min_width="22"
- width="22">
+ width="22"
+ layout="topleft"
+ tool_tip="Navigate forward">
<button.commit_callback
function="MediaCtrl.Forward" />
</button>
@@ -96,10 +143,12 @@
auto_resize="false"
user_resize="false"
layout="topleft"
- top="-2"
+ top="0"
+ height="22"
min_width="22"
width="22">
<button
+ follows="top"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_overlay="Home_Off"
@@ -108,6 +157,7 @@
hover_glow_amount="0.15"
layout="topleft"
tool_tip="Home page"
+ top="0"
height="22"
min_width="22"
width="22">
@@ -120,19 +170,22 @@
auto_resize="false"
user_resize="false"
layout="topleft"
- top="2"
+ top="0"
+ height="22"
min_width="22"
width="22">
<button
+ follows="top"
image_overlay="Stop_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
hover_glow_amount="0.15"
- height="22"
layout="topleft"
tool_tip="Stop media"
+ top="0"
+ height="22"
min_width="22"
width="22">
<button.commit_callback
@@ -144,11 +197,12 @@
auto_resize="false"
user_resize="false"
layout="topleft"
- top="6"
+ top="0"
+ height="22"
min_width="22"
width="22">
<button
- height="22"
+ follows="top"
image_overlay="Refresh_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
@@ -157,6 +211,8 @@
hover_glow_amount="0.15"
layout="topleft"
tool_tip="Reload"
+ top="0"
+ height="22"
min_width="22"
width="22">
<button.commit_callback
@@ -168,11 +224,12 @@
auto_resize="false"
user_resize="false"
layout="topleft"
- top="10"
+ top="0"
+ height="22"
min_width="22"
width="22">
<button
- height="22"
+ follows="top"
image_overlay="StopReload_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
@@ -181,6 +238,8 @@
hover_glow_amount="0.15"
layout="topleft"
tool_tip = "Stop loading"
+ top="0"
+ height="22"
min_width="22"
width="22">
<button.commit_callback
@@ -192,10 +251,12 @@
auto_resize="false"
user_resize="false"
layout="topleft"
- top="14"
+ top="0"
+ height="22"
min_width="22"
width="24">
<button
+ follows="top"
image_overlay="Play_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
@@ -205,7 +266,7 @@
layout="topleft"
tool_tip = "Play media"
left_delta="2"
- top="4"
+ top="0"
height="22"
min_width="22"
width="22">
@@ -218,10 +279,11 @@
auto_resize="false"
user_resize="false"
layout="topleft"
- top="18"
+ top="0"
min_width="22"
width="24">
<button
+ follows="top"
image_overlay="Pause_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
@@ -229,10 +291,10 @@
image_unselected="PushButton_Off"
hover_glow_amount="0.15"
layout="topleft"
+ top="0"
height="22"
width="22"
left_delta="-1"
- top="4"
tool_tip = "Pause media">
<button.commit_callback
function="MediaCtrl.Pause" />
@@ -246,11 +308,12 @@
height="24"
follows="left|right|bottom"
layout="topleft"
+ top="0"
width="190"
min_width="90">
<line_editor
name="media_address_url"
- follows="left|right"
+ follows="top|left|right"
height="22"
top="0"
tool_tip="Media URL"
@@ -261,17 +324,18 @@
<layout_stack
name="media_address_url_icons"
animate="false"
- follows="right"
+ follows="top|right"
height="20"
width="38"
- right="-2"
- top="-1"
- mouse_opaque="false"
+ top="0"
+ right="-1"
+ border_size="0"
+ mouse_opaque="false"
orientation="horizontal">
<layout_panel
layout="topleft"
width="16"
- mouse_opaque="false"
+ mouse_opaque="false"
auto_resize="false"
user_resize="false">
<icon
@@ -287,7 +351,7 @@
<layout_panel
layout="topleft"
width="16"
- mouse_opaque="false"
+ mouse_opaque="false"
auto_resize="false"
user_resize="false">
<icon
@@ -305,16 +369,17 @@
name="media_play_position"
auto_resize="true"
user_resize="false"
- follows="left|right|top|bottom"
+ follows="left|right"
layout="topleft"
- height="16"
+ top="0"
+ height="22"
min_width="100"
width="200">
<slider_bar
name="media_play_slider"
follows="left|right|top"
- height="20"
- bottom="88"
+ top="0"
+ height="22"
increment="0.01"
initial_value="0.5"
layout="topleft"
@@ -330,9 +395,11 @@
auto_resize="false"
user_resize="false"
layout="topleft"
+ top="0"
min_width="22"
width="22">
<button
+ follows="top"
image_overlay="SkipBackward_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
@@ -343,7 +410,7 @@
height="22"
layout="topleft"
tool_tip="Step back"
- top="-14"
+ top="0"
width="22"
left="0">
<button.commit_callback
@@ -355,9 +422,11 @@
auto_resize="false"
user_resize="false"
layout="topleft"
+ top="0"
min_width="22"
width="22">
<button
+ follows="top"
image_overlay="SkipForward_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
@@ -367,7 +436,7 @@
height="22"
layout="topleft"
tool_tip="Step forward"
- top="-14"
+ top="0"
min_width="22"
width="22">
<button.commit_callback
@@ -379,26 +448,28 @@
auto_resize="false"
user_resize="false"
layout="topleft"
- top="-50"
+ top="0"
height="72"
min_width="22"
width="22">
<!-- Note: this is not quite right either...the mute button is not the -->
<!-- same as the others because it cannot have the "image_overlay" be -->
<!-- two different images. -->
+ <!-- Note also: the button and the slider must overlap! -->
<button
+ follows="top"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
hover_glow_amount="0.15"
name="media_mute_button"
- height="22"
is_toggle="true"
layout="topleft"
scale_image="false"
tool_tip="Mute This Media"
- top="118"
+ top="0"
+ height="20"
min_width="22"
width="22" >
<button.commit_callback
@@ -411,7 +482,7 @@
<slider
orientation="vertical"
left="0"
- top="-2"
+ top="16"
height="50"
layout="topleft"
increment="0.01"
@@ -428,35 +499,24 @@
function="MediaCtrl.HideVolumeSlider" />
</slider>
</layout_panel>
- <panel
- height="28"
- layout="topleft"
- auto_resize="false"
- min_width="3"
- width="3">
- <icon
- height="26"
- image_name="media_panel_divider.png"
- layout="topleft"
- top="0"
- min_width="3"
- width="3" />
- </panel>
<layout_panel
name="zoom_frame"
auto_resize="false"
user_resize="false"
layout="topleft"
+ top="0"
height="28"
min_width="22"
width="22">
<button
+ follows="top"
image_overlay="Zoom_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
hover_glow_amount="0.15"
+ top="0"
height="22"
layout="topleft"
tool_tip="Zoom into media"
@@ -471,15 +531,18 @@
auto_resize="false"
user_resize="false"
layout="topleft"
+ top="0"
min_width="21"
width="21" >
<button
+ follows="top"
image_overlay="UnZoom_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
hover_glow_amount="0.15"
+ top="0"
height="22"
layout="topleft"
tool_tip ="Zoom Back"
@@ -494,9 +557,11 @@
auto_resize="false"
user_resize="false"
layout="topleft"
+ top="0"
min_width="22"
width="22">
<button
+ follows="top"
image_overlay="ExternalBrowser_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
@@ -506,7 +571,7 @@
height="22"
layout="topleft"
tool_tip = "Open URL in browser"
- top_delta="-4"
+ top="0"
min_width="24"
width="24" >
<button.commit_callback
@@ -516,46 +581,16 @@
<!-- bookend panel -->
<layout_panel
name="right_bookend"
- width="0"
- layout="topleft"
- user_resize="false" />
- </layout_stack>
- <layout_stack
- follows="left|right|bottom"
- height="20"
- layout="topleft"
- animate="false"
- left="0"
- orientation="horizontal"
- top="170">
- <!-- outer layout_panels center the inner one -->
- <layout_panel
- width="0"
- layout="topleft"
- user_resize="false" />
- <panel
- name="media_progress_indicator"
- height="20"
- layout="topleft"
- left="0"
top="0"
- auto_resize="false"
- user_resize="false"
- min_width="100"
- width="200">
- <progress_bar
- name="media_progress_bar"
- color_bar="1 1 1 0.96"
- follows="left|right|top"
- top="5"
- height="8"
- layout="topleft"
- left="0"
- tool_tip="Media is Loading"/>
- </panel>
- <layout_panel
width="0"
layout="topleft"
user_resize="false" />
</layout_stack>
+ <panel
+ name="media_region"
+ height="100"
+ follows="left|right|top|bottom"
+ layout="topleft"
+ mouse_opaque="false"
+ top="30" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 342cf4144f..5ccc964c9a 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -27,42 +27,59 @@
<string
name="no_partner_text"
value="None" />
- <string
+ <string
name="RegisterDateFormat">
[REG_DATE] ([AGE])
</string>
- <scroll_container
- color="DkGray2"
+ <layout_stack
+ name="layout"
+ orientation="vertical"
follows="all"
- height="485"
layout="topleft"
- name="profile_scroll"
- reserve_scroll_corner="true"
- opaque="true"
+ left="0"
top="0"
- width="313">
+ height="535"
+ width="313"
+ border_size="0">
<panel
- name="scroll_content_panel"
- follows="left|top|right"
- height="485"
+ name="profile_stack"
+ follows="all"
layout="topleft"
top="0"
left="0"
+ height="505"
width="313">
+ <scroll_container
+ color="DkGray2"
+ follows="all"
+ layout="topleft"
+ left="0"
+ name="profile_scroll"
+ opaque="true"
+ height="505"
+ width="313"
+ top="0">
+ <panel
+ layout="topleft"
+ follows="left|top|right"
+ name="profile_scroll_panel"
+ top="0"
+ left="0"
+ width="303">
<panel
- follows="left|top"
+ follows="left|top|right"
height="117"
layout="topleft"
left="10"
name="second_life_image_panel"
top="0"
- width="280">
+ width="303">
<texture_picker
allow_no_texture="true"
default_image_name="None"
enabled="false"
follows="top|left"
- height="102"
+ height="117"
layout="topleft"
left="0"
name="2nd_life_pic"
@@ -78,7 +95,7 @@
text_color="white"
top_delta="0"
value="[SECOND_LIFE]:"
- width="165" />
+ width="180" />
<expandable_text
follows="left|top|right"
height="95"
@@ -87,26 +104,26 @@
textbox.max_length="512"
name="sl_description_edit"
top_pad="-3"
- width="173"
+ width="185"
expanded_bg_visible="true"
expanded_bg_color="DkGray">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
</expandable_text>
</panel>
<panel
- follows="left|top"
+ follows="left|top|right"
height="117"
layout="topleft"
top_pad="10"
left="10"
name="first_life_image_panel"
- width="280">
+ width="303">
<texture_picker
allow_no_texture="true"
default_image_name="None"
enabled="false"
follows="top|left"
- height="102"
+ height="117"
layout="topleft"
left="0"
name="real_world_pic"
@@ -121,7 +138,7 @@
text_color="white"
top_delta="0"
value="Real World:"
- width="165" />
+ width="180" />
<expandable_text
follows="left|top|right"
height="95"
@@ -130,57 +147,45 @@
textbox.max_length="512"
name="fl_description_edit"
top_pad="-3"
- width="173"
+ width="185"
expanded_bg_visible="true"
expanded_bg_color="DkGray">
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.
</expandable_text>
</panel>
- <text
- type="string"
- follows="left|top"
- font="SansSerifSmall"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="10"
- name="me_homepage_text"
- text_color="white"
- top_pad="0"
- width="280">
- Homepage:
- </text>
- <text
+ <text
follows="left|top"
height="15"
+ font.style="BOLD"
+ font="SansSerifMedium"
layout="topleft"
left="10"
name="homepage_edit"
top_pad="0"
value="http://librarianavengers.org"
- width="280"
+ width="300"
word_wrap="false"
use_ellipses="true"
/>
<text
follows="left|top"
- font.style="BOLD"
+ font.style="BOLD"
height="10"
layout="topleft"
left="10"
name="title_member_text"
text_color="white"
top_pad="10"
- value="Member Since:"
- width="280" />
+ value="Resident Since:"
+ width="300" />
<text
follows="left|top"
height="15"
layout="topleft"
left="10"
name="register_date"
- value="05/31/1976"
- width="280"
+ value="05/31/2376"
+ width="300"
word_wrap="true" />
<text
follows="left|top"
@@ -190,9 +195,9 @@
left="10"
name="title_acc_status_text"
text_color="white"
- top_pad="10"
+ top_pad="5"
value="Account Status:"
- width="280" />
+ width="300" />
<!-- <text
type="string"
follows="left|top"
@@ -206,14 +211,16 @@
width="100"/> -->
<text
follows="left|top"
- height="20"
+ height="28"
layout="topleft"
left="10"
name="acc_status_text"
top_pad="0"
- value="Resident. No payment info on file."
- width="280"
- word_wrap="true" />
+ width="300"
+ word_wrap="true">
+ Resident. No payment info on file.
+Linden.
+ </text>
<text
follows="left|top"
font.style="BOLD"
@@ -222,9 +229,9 @@
left="10"
name="title_partner_text"
text_color="white"
- top_pad="5"
+ top_pad="3"
value="Partner:"
- width="280" />
+ width="300" />
<panel
follows="left|top"
height="15"
@@ -232,7 +239,7 @@
left="10"
name="partner_data_panel"
top_pad="0"
- width="280">
+ width="300">
<text
follows="left|top"
height="10"
@@ -241,43 +248,41 @@
name="partner_text"
top="0"
value="[FIRST] [LAST]"
- width="280"
+ width="300"
word_wrap="true" />
</panel>
<text
follows="left|top"
font.style="BOLD"
- height="15"
+ height="13"
layout="topleft"
left="10"
name="title_groups_text"
text_color="white"
- top_pad="8"
+ top_pad="3"
value="Groups:"
- width="280" />
- <expandable_text
- follows="left|top|bottom"
- height="60"
+ width="300" />
+ <expandable_text
+ follows="all"
+ height="113"
layout="topleft"
- left="10"
- name="sl_groups"
- top_pad="0"
- width="280"
- expanded_bg_visible="true"
- expanded_bg_color="DkGray">
- 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.
+ left="7"
+ name="sl_groups"
+ top_pad="0"
+ width="298"
+ expanded_bg_visible="true"
+ expanded_bg_color="DkGray">
+ 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. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
</expandable_text>
- </panel>
+ </panel>
</scroll_container>
+</panel>
<panel
- follows="bottom|left"
- layout="topleft"
- left="0"
- name="profile_buttons_panel"
- top_pad="2"
- bottom="0"
- height="19"
- width="303">
+ follows="bottom|left"
+ height="28"
+ layout="topleft"
+ name="profile_buttons_panel"
+ width="313">
<button
follows="bottom|left"
height="23"
@@ -288,7 +293,7 @@
name="add_friend"
tool_tip="Offer friendship to the resident"
top="5"
- width="77" />
+ width="80" />
<button
follows="bottom|left"
height="23"
@@ -297,8 +302,8 @@
name="im"
tool_tip="Open instant message session"
top="5"
- left_pad="5"
- width="33" />
+ left_pad="3"
+ width="45" />
<button
follows="bottom|left"
height="23"
@@ -306,9 +311,9 @@
layout="topleft"
name="call"
tool_tip="Call this resident"
- left_pad="5"
+ left_pad="3"
top="5"
- width="40" />
+ width="45" />
<button
enabled="false"
follows="bottom|left"
@@ -318,8 +323,8 @@
name="show_on_map_btn"
tool_tip="Show the resident on the map"
top="5"
- left_pad="5"
- width="44" />
+ left_pad="3"
+ width="45" />
<button
follows="bottom|left"
height="23"
@@ -327,10 +332,10 @@
layout="topleft"
name="teleport"
tool_tip="Offer teleport"
- left_pad="5"
+ left_pad="3"
top="5"
- width="67" />
- <button
+ width="85" />
+ <!-- <button
follows="bottom|right"
height="23"
label="▼"
@@ -339,23 +344,25 @@
tool_tip="Pay money to or share inventory with the resident"
right="-1"
top="5"
- width="21" />
- </panel>
+ left_pad="3"
+ width="23" />-->
+ </panel>
<panel
- follows="bottom|left"
- layout="topleft"
- left="0"
- top_pad="-17"
- name="profile_me_buttons_panel"
- visible="false"
- height="19"
- width="303">
+ follows="bottom|left"
+ height="28"
+ layout="topleft"
+ top_pad="-26"
+ name="profile_me_buttons_panel"
+ visible="false"
+ width="313">
<button
follows="bottom|right"
height="23"
- left="10"
+ left="20"
+ top="0"
label="Edit Profile"
name="edit_profile_btn"
+ tool_tip="Edit your personal information"
width="130" />
<button
follows="bottom|right"
@@ -363,7 +370,8 @@
label="Edit Appearance"
left_pad="10"
name="edit_appearance_btn"
- right="-10"
+ tool_tip="Create/edit your appearance: physical data, clothes and etc."
width="130" />
- </panel>
-</panel>
+ </panel>
+ </layout_stack>
+</panel> \ No newline at end of file
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 6324ec2bd8..c51447eaf0 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -26,8 +26,8 @@
top="2"
width="23" />
<text_editor
- allow_scroll="false"
- bg_visible="false"
+ allow_scroll="false"
+ bg_visible="false"
read_only = "true"
follows="top|left|right"
font="SansSerifHugeBold"
@@ -55,7 +55,7 @@
halign="center"
layout="topleft"
left="10"
- min_width="333"
+ min_width="333"
name="tabs"
tab_min_width="80"
tab_height="30"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 07:34:29 +0000