diff options
Diffstat (limited to 'indra/newview/skins/default')
17 files changed, 345 insertions, 110 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 8bfd64b3df..05fc48f3a8 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1177,7 +1177,7 @@ Only large parcels can be listed in search. </panel.string> <panel.string name="mature_check_mature"> - Mature Content + Moderate Content </panel.string> <panel.string name="mature_check_adult"> @@ -1185,7 +1185,7 @@ Only large parcels can be listed in search. </panel.string> <panel.string name="mature_check_mature_tooltip"> - Your parcel information or content is considered mature. + Your parcel information or content is considered moderate. </panel.string> <panel.string name="mature_check_adult_tooltip"> @@ -1478,7 +1478,7 @@ Only large parcels can be listed in search. </combo_box> <check_box height="16" - label="Mature Content" + label="Moderate Content" layout="topleft" left="14" name="MatureCheck" diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index 0856049374..c8aab2c1e0 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater + border_visible = "false" + border_drop_shadow_visible = "false" + drop_shadow_visible = "false" + border = "false" + bg_opaque_image="Inspector_Background" + bg_alpha_image="Toast_Background" + bg_alpha_color="0 0 0 0" legacy_header_height="18" can_minimize="false" can_tear_off="false" diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index 91ca3ef27a..f1a75bfcb4 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -309,7 +309,7 @@ name="Indecency__Mature_content_in_PG_region" value="60" /> <combo_box.item - label="Indecency > Inappropriate content or conduct in a Mature region" + label="Indecency > Inappropriate content or conduct in a Moderate region" name="Indecency__Inappropriate_content_in_Mature_region" value="69" /> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index c0eca91a46..9c11a88c34 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -393,21 +393,21 @@ </panel> <panel - follows="right|top|bottom" - height="270" - top_pad="0" - width="238"> - <icon - color="0.5 0 0 1" - follows="top|right" - height="16" - image_name="map_track_16.tga" - layout="topleft" - left="5" - top="11" - mouse_opaque="true" - name="friends_icon" - width="16" /> + follows="right|top|bottom" + height="270" + top_pad="0" + width="238"> + <icon + color="0.5 0 0 1" + follows="top|right" + height="16" + image_name="map_track_16.tga" + layout="topleft" + left="5" + top="11" + mouse_opaque="true" + name="friends_icon" + width="16" /> <combo_box allow_text_entry="true" follows="top|right" diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index dd3cf079db..8349f594d9 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -19,7 +19,7 @@ <!-- Allowed fields include: [BORN_ON] ("12/3/2008") [SL_PROFILE] (Second Life profile), - [RW_PROFILE] (real world profile), + [RW_PROFILE] (real world profile), [ACCTTYPE] ("Resident"), [PAYMENTINFO] ("Payment Info on File"), [AGE] ("1 year 2 months") @@ -32,10 +32,6 @@ name="Details"> [SL_PROFILE] </string> - <string - name="Partner"> - Partner: [PARTNER] - </string> <text follows="all" font="SansSerifLarge" @@ -52,31 +48,20 @@ height="16" left="8" name="user_subtitle" - font="SansSerifSmall" - text_color="White" + font="SansSerifSmall" + text_color="White" value="11 Months, 3 days old" width="175" use_ellipses="true" /> <text follows="all" - height="25" - left="8" + height="35" + left="8" name="user_details" word_wrap="true" top_pad="6" width="220">This is my second life description and I really think it is great. </text> - <text - follows="all" - height="13" - left="8" - name="user_partner" - top_pad="3" - width="220" - use_ellipses="true" - word_wrap="false"> - Erica Linden - </text> <slider follows="top|left" height="23" @@ -113,8 +98,9 @@ name="avatar_icon" top="10" width="38" /> - <!-- Overlapping buttons for default actions - llinspectavatar.cpp makes visible the most likely default action --> +<!-- Overlapping buttons for default actions + llinspectavatar.cpp makes visible the most likely default action +--> <button follows="bottom|left" height="20" @@ -131,9 +117,8 @@ top_delta="0" name="im_btn" width="80" - commit_callback.function="InspectAvatar.IM" - /> - <button + commit_callback.function="InspectAvatar.IM"/> + <button follows="top|left" height="20" label="More" @@ -153,7 +138,7 @@ right="-5" top_delta="0" width="35" /> - <menu_button + <menu_button follows="top|left" height="20" image_overlay="OptionsMenu_Off" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f48cc6d4bf..d8eb65322b 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3480,7 +3480,7 @@ Publish this classified now for L$[AMOUNT]? icon="alertmodal.tga" name="SetClassifiedMature" type="alertmodal"> -Does this classified contain Mature content? +Does this classified contain Moderate content? <usetemplate canceltext="Cancel" name="yesnocancelbuttons" @@ -3492,7 +3492,7 @@ Does this classified contain Mature content? icon="alertmodal.tga" name="SetGroupMature" type="alertmodal"> -Does this group contain Mature content? +Does this group contain Moderate content? <usetemplate canceltext="Cancel" name="yesnocancelbuttons" @@ -4568,7 +4568,7 @@ Some terms in your search query were excluded due to content restrictions as cla icon="notifytip.tga" name="NoContentToSearch" type="notifytip"> -Please select at least one type of content to search (PG, Mature, or Adult). +Please select at least one type of content to search (General, Moderate, or Adult). </notification> <notification diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml index 18d12aef70..9622313786 100644 --- a/indra/newview/skins/default/xui/en/panel_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_classified.xml @@ -111,11 +111,11 @@ name="select_mature" value="Select" /> <combo_box.item - label="Mature Content" + label="Moderate Content" name="mature" value="Mature" /> <combo_box.item - label="PG Content" + label="General Content" name="pg" value="PG" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index df889e87c3..5c594d3f14 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -11,11 +11,11 @@ width="333"> <panel.string name="type_mature"> - Mature + Moderate </panel.string> <panel.string name="type_pg"> - PG Content + General Content </panel.string> <button follows="top|right" diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index 2f3277804f..b5760e977f 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -189,12 +189,12 @@ <combo_item name="mature_ci" value="Mature"> - Mature Content + Moderate Content </combo_item> <combo_item name="pg_ci" value="PG"> - PG Content + General Content </combo_item> </combo_box> <spinner diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 4c30db4034..06c187991f 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -156,15 +156,15 @@ Hover your mouse over the options for more help. layout="topleft" left_delta="0" name="group_mature_check" - tool_tip="Sets whether your group information is considered mature" + tool_tip="Sets whether your group information is considered moderate" top_pad="2" width="190"> <combo_box.item - label="PG Content" + label="General Content" name="pg" value="Not Mature" /> <combo_box.item - label="Mature Content" + label="Moderate Content" name="mature" value="Mature" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 9ab5c6b4f7..3f5da66dce 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -602,7 +602,7 @@ layout="topleft" left_pad="10" name="region_rating" - value="Explicit" + value="Adult" width="159" /> <text follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index 6bb937e3c6..ee9bfbae93 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -143,15 +143,15 @@ top_pad="-10" width="170"> <combo_box.item - label="PG, Mature and Adult" + label="General, Moderate, Adult" name="Desired_Adult" value="42" /> <combo_box.item - label="PG and Mature" + label="General and Moderate" name="Desired_Mature" value="21" /> <combo_box.item - label="PG" + label="General" name="Desired_PG" value="13" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 42c6319699..79d8f3a0ee 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -171,7 +171,7 @@ </text> <combo_box height="20" - label="Mature" + label="Moderate" layout="topleft" left_delta="100" name="access_combo" @@ -182,11 +182,11 @@ name="Adult" value="42" /> <combo_box.item - label="Mature" + label="Moderate" name="Mature" value="21" /> <combo_box.item - label="PG" + label="General" name="PG" value="13" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml new file mode 100644 index 0000000000..525c5aa8e7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml @@ -0,0 +1,242 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="top|left" + height="360" + label="Region" + layout="topleft" + left="0" + name="General" + top="360" + width="280"> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left="10" + name="region_text_lbl" + top="10" + width="100"> + Region: + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="50" + name="region_text" + top_delta="0" + width="200"> + unknown + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left="10" + name="version_channel_text_lbl" + top="30" + width="100"> + Version: + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="50" + name="version_channel_text" + top_delta="0" + width="200"> + unknown + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left="10" + name="region_type_lbl" + top="50" + width="100"> + Type: + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="50" + name="region_type" + top_delta="0" + width="200"> + unknown + </text> + <check_box + height="20" + label="Block Terraform" + layout="topleft" + left="10" + name="block_terraform_check" + top="70" + width="80" /> + <check_box + height="20" + label="Block Fly" + layout="topleft" + left="10" + name="block_fly_check" + top="90" + width="80" /> + <check_box + height="20" + label="Allow Damage" + layout="topleft" + left="10" + name="allow_damage_check" + top="110" + width="80" /> + <check_box + height="20" + label="Restrict Pushing" + layout="topleft" + left="10" + name="restrict_pushobject" + top="130" + width="80" /> + <check_box + height="20" + label="Allow Land Resell" + layout="topleft" + left="10" + name="allow_land_resell_check" + top="160" + width="80" /> + <check_box + height="20" + label="Allow Land Join/Divide" + layout="topleft" + left="10" + name="allow_parcel_changes_check" + top="180" + width="80" /> + <check_box + height="20" + label="Block Land Show in Search" + layout="topleft" + left="10" + name="block_parcel_search_check" + tool_tip="Let people see this region and its parcels in search results" + top="200" + width="80" /> + <spinner + follows="left|top" + height="20" + increment="1" + label="Agent Limit" + label_width="97" + layout="topleft" + left="10" + max_val="100" + min_val="1" + name="agent_limit_spin" + top="240" + width="170" /> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Object Bonus" + label_width="97" + layout="topleft" + left="10" + max_val="10" + min_val="1" + name="object_bonus_spin" + top="260" + width="170" /> + <text + follows="left|top" + height="20" + label="Maturity" + layout="topleft" + left="10" + name="access_text" + top="290" + width="100"> + Rating: + </text> + <combo_box + height="20" + label="Moderate" + layout="topleft" + left_delta="100" + name="access_combo" + top_delta="0" + width="85"> + <combo_box.item + label="Adult" + name="Adult" + value="42" /> + <combo_box.item + label="Moderate" + name="Mature" + value="21" /> + <combo_box.item + label="General" + name="PG" + value="13" /> + </combo_box> + <button + enabled="false" + follows="left|top" + height="20" + label="Apply" + layout="topleft" + left="108" + name="apply_btn" + top="320" + width="100"/> + <button + follows="left|top" + height="20" + label="Teleport Home One User..." + layout="topleft" + left="10" + name="kick_btn" + top_pad="10" + width="250" /> + <button + follows="left|top" + height="20" + label="Teleport Home All Users..." + layout="topleft" + left_delta="0" + name="kick_all_btn" + top_pad="3" + width="250" /> + <button + follows="left|top" + height="20" + label="Send Message To Region..." + layout="topleft" + left_delta="0" + name="im_btn" + top_pad="20" + width="200" /> + <button + follows="left|top" + height="20" + label="Manage Telehub..." + layout="topleft" + left_delta="0" + name="manage_telehub_btn" + top_pad="20" + width="150" > + <button.commit_callback + function="RegionInfo.ManageTelehub" /> + </button> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index 4293051dbd..6479fc91ca 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -5,28 +5,28 @@ <floater legacy_header_height="18" - name="toast" - title="" - visible="false" - layout="topleft" - height="40" - width="305" - left="0" - top="0" - follows="right|bottom" - bg_opaque_image="Toast_Background" - bg_alpha_image="Toast_Background" - can_minimize="false" - can_tear_off="false" - can_resize="false" - can_drag_on_left="false" - can_close="false" - can_dock="false" - border_visible = "false" - border_drop_shadow_visible = "false" - drop_shadow_visible = "false" - border = "false" - > + name="toast" + title="" + visible="false" + layout="topleft" + height="40" + width="305" + left="0" + top="0" + follows="right|bottom" + bg_opaque_image="Toast_Background" + bg_alpha_image="Toast_Background" + can_minimize="false" + can_tear_off="false" + can_resize="false" + can_drag_on_left="false" + can_close="false" + can_dock="false" + border_visible = "false" + border_drop_shadow_visible = "false" + drop_shadow_visible = "false" + border = "false" +> <!-- Don't remove this wiget! It is needed for Overflow and Start-Up toasts!--> <text clip_partial="true" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e47ec1ebda..e795c8e241 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -270,8 +270,8 @@ <string name="NotConnected">Not Connected</string> <!-- Sim Access labels --> - <string name="SIM_ACCESS_PG">PG</string> - <string name="SIM_ACCESS_MATURE">Mature</string> + <string name="SIM_ACCESS_PG">General</string> + <string name="SIM_ACCESS_MATURE">Moderate</string> <string name="SIM_ACCESS_ADULT">Adult</string> <string name="SIM_ACCESS_DOWN">Offline</string> <string name="SIM_ACCESS_MIN">Unknown</string> diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 2263866471..1425258b2a 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -1,25 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- See also settings.xml UIFloater* settings for configuration --> -<floater name="floater" - bg_opaque_color="FloaterFocusBackgroundColor" - bg_alpha_color="FloaterDefaultBackgroundColor" - bg_opaque_image="Window_Foreground" - bg_alpha_image="Window_Background" - background_visible="true" - background_opaque="false" - header_height="25" - close_image="Icon_Close_Foreground" - restore_image="Icon_Restore_Foreground" - minimize_image="Icon_Minimize_Foreground" - tear_off_image="tearoffbox.tga" - dock_image="Icon_Dock_Foreground" - undock_image="Icon_Undock_Foreground" - help_image="Icon_Help_Foreground" - close_pressed_image="Icon_Close_Press" - restore_pressed_image="Icon_Restore_Press" - minimize_pressed_image="Icon_Minimize_Press" - tear_off_pressed_image="tearoff_pressed.tga" - dock_pressed_image="Icon_Dock_Press" - undock_pressed_image="Icon_Undock_Press" - help_pressed_image="Icon_Help_Press" +<floater + name="floater" + bg_opaque_color="FloaterFocusBackgroundColor" + bg_alpha_color="FloaterDefaultBackgroundColor" + bg_opaque_image="Window_Foreground" + bg_alpha_image="Window_Background" + background_visible="true" + background_opaque="false" + header_height="25" + close_image="Icon_Close_Foreground" + restore_image="Icon_Restore_Foreground" + minimize_image="Icon_Minimize_Foreground" + tear_off_image="tearoffbox.tga" + dock_image="Icon_Dock_Foreground" + undock_image="Icon_Undock_Foreground" + help_image="Icon_Help_Foreground" + close_pressed_image="Icon_Close_Press" + restore_pressed_image="Icon_Restore_Press" + minimize_pressed_image="Icon_Minimize_Press" + tear_off_pressed_image="tearoff_pressed.tga" + dock_pressed_image="Icon_Dock_Press" + undock_pressed_image="Icon_Undock_Press" + help_pressed_image="Icon_Help_Press" /> |