From 98cc2365034a93c69704daa69efb389799cc9627 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 24 Aug 2010 18:44:39 +0100 Subject: Backed out changeset a62bf7c0af21 Backing out this merge that I pushed (prematurely) to the wrong place. --- indra/newview/skins/default/colors.xml | 2 +- indra/newview/skins/default/xui/en/floater_aaa.xml | 2 +- .../newview/skins/default/xui/en/floater_about.xml | 2 +- .../newview/skins/default/xui/en/floater_event.xml | 1 + .../skins/default/xui/en/floater_im_session.xml | 2 +- .../skins/default/xui/en/floater_nearby_chat.xml | 2 +- .../default/xui/en/floater_preview_gesture.xml | 16 +- .../default/xui/en/floater_preview_notecard.xml | 2 +- .../skins/default/xui/en/floater_search.xml | 8 +- .../skins/default/xui/en/floater_snapshot.xml | 34 +- .../newview/skins/default/xui/en/floater_tools.xml | 15 +- .../skins/default/xui/en/inspect_object.xml | 2 +- .../default/xui/en/menu_add_wearable_gear.xml | 41 -- .../default/xui/en/menu_inspect_object_gear.xml | 9 - indra/newview/skins/default/xui/en/menu_object.xml | 9 - .../default/xui/en/menu_places_gear_folder.xml | 6 - indra/newview/skins/default/xui/en/menu_viewer.xml | 186 ++---- .../default/xui/en/menu_wearable_list_item.xml | 2 +- .../skins/default/xui/en/menu_wearing_tab.xml | 18 - .../newview/skins/default/xui/en/notifications.xml | 13 - .../skins/default/xui/en/outfit_accordion_tab.xml | 1 - indra/newview/skins/default/xui/en/panel_bars.xml | 18 + .../default/xui/en/panel_body_parts_list_item.xml | 2 +- .../skins/default/xui/en/panel_chat_header.xml | 27 +- .../skins/default/xui/en/panel_classified_info.xml | 4 +- .../default/xui/en/panel_classifieds_list_item.xml | 1 + .../default/xui/en/panel_clothing_list_item.xml | 2 +- .../xui/en/panel_deletable_wearable_list_item.xml | 2 +- .../xui/en/panel_dummy_clothing_list_item.xml | 2 +- .../skins/default/xui/en/panel_group_list_item.xml | 2 +- .../skins/default/xui/en/panel_group_notify.xml | 2 +- .../skins/default/xui/en/panel_group_roles.xml | 2 +- .../skins/default/xui/en/panel_inventory_item.xml | 2 +- .../skins/default/xui/en/panel_landmark_info.xml | 5 +- .../xui/en/panel_media_settings_permissions.xml | 15 +- .../skins/default/xui/en/panel_my_profile.xml | 3 + .../skins/default/xui/en/panel_navigation_bar.xml | 2 - .../skins/default/xui/en/panel_notification.xml | 2 +- .../skins/default/xui/en/panel_pick_info.xml | 2 +- .../skins/default/xui/en/panel_pick_list_item.xml | 1 + .../skins/default/xui/en/panel_place_profile.xml | 5 +- .../default/xui/en/panel_preferences_graphics1.xml | 274 +++++---- .../newview/skins/default/xui/en/panel_profile.xml | 3 + .../default/xui/en/panel_teleport_history_item.xml | 2 +- .../skins/default/xui/en/panel_topinfo_bar.xml | 10 +- indra/newview/skins/default/xui/en/strings.xml | 12 - .../default/xui/en/widgets/bodyparts_list_item.xml | 2 +- .../default/xui/en/widgets/clothing_list_item.xml | 2 +- .../en/widgets/deletable_wearable_list_item.xml | 2 +- .../xui/en/widgets/dummy_clothing_list_item.xml | 2 +- .../default/xui/en/widgets/expandable_text.xml | 3 +- .../default/xui/en/widgets/inventory_list_item.xml | 2 +- .../skins/default/xui/en/widgets/scroll_list.xml | 1 - .../default/xui/en/widgets/simple_text_editor.xml | 4 +- .../newview/skins/default/xui/en/widgets/text.xml | 4 +- .../skins/default/xui/en/widgets/text_editor.xml | 3 +- .../skins/default/xui/fr/floater_postcard.xml | 2 +- .../default/xui/fr/floater_preview_gesture.xml | 2 +- .../newview/skins/default/xui/fr/floater_tools.xml | 4 +- indra/newview/skins/default/xui/fr/menu_object.xml | 6 +- indra/newview/skins/default/xui/fr/menu_picks.xml | 2 +- .../newview/skins/default/xui/fr/notifications.xml | 6 +- .../skins/default/xui/fr/panel_pick_info.xml | 2 +- .../skins/default/xui/fr/panel_script_ed.xml | 2 +- .../skins/default/xui/pl/floater_bulk_perms.xml | 4 +- indra/newview/skins/default/xui/pl/floater_pay.xml | 2 +- .../skins/default/xui/pl/floater_pay_object.xml | 4 +- .../skins/default/xui/pl/floater_post_process.xml | 2 +- .../skins/default/xui/pl/floater_postcard.xml | 8 +- .../default/xui/pl/floater_preview_gesture.xml | 2 +- .../xui/pl/floater_preview_gesture_info.xml | 2 +- .../xui/pl/floater_preview_gesture_shortcut.xml | 2 +- .../xui/pl/floater_preview_gesture_steps.xml | 2 +- .../skins/default/xui/pl/floater_preview_sound.xml | 2 +- .../skins/default/xui/pl/floater_report_abuse.xml | 6 +- .../skins/default/xui/pl/floater_script_search.xml | 2 +- .../skins/default/xui/pl/floater_sell_land.xml | 12 +- .../newview/skins/default/xui/pl/floater_stats.xml | 14 +- .../newview/skins/default/xui/pl/floater_tools.xml | 30 +- .../skins/default/xui/pl/floater_top_objects.xml | 8 +- .../default/xui/pl/floater_windlight_options.xml | 6 +- .../skins/default/xui/pl/floater_world_map.xml | 20 +- .../skins/default/xui/pl/inspect_avatar.xml | 4 +- .../newview/skins/default/xui/pl/inspect_group.xml | 2 +- .../skins/default/xui/pl/inspect_object.xml | 2 +- .../skins/default/xui/pl/menu_attachment_other.xml | 6 +- .../skins/default/xui/pl/menu_attachment_self.xml | 6 +- .../skins/default/xui/pl/menu_avatar_icon.xml | 2 +- .../skins/default/xui/pl/menu_avatar_other.xml | 6 +- .../skins/default/xui/pl/menu_avatar_self.xml | 12 +- .../skins/default/xui/pl/menu_bottomtray.xml | 8 +- .../newview/skins/default/xui/pl/menu_cof_gear.xml | 2 +- .../skins/default/xui/pl/menu_favorites.xml | 2 +- .../skins/default/xui/pl/menu_group_plus.xml | 4 +- .../skins/default/xui/pl/menu_imchiclet_group.xml | 2 +- .../skins/default/xui/pl/menu_imchiclet_p2p.xml | 4 +- .../default/xui/pl/menu_inspect_avatar_gear.xml | 6 +- .../default/xui/pl/menu_inspect_self_gear.xml | 6 +- .../skins/default/xui/pl/menu_inventory.xml | 14 +- .../skins/default/xui/pl/menu_inventory_add.xml | 6 +- .../default/xui/pl/menu_inventory_gear_default.xml | 2 +- indra/newview/skins/default/xui/pl/menu_land.xml | 2 +- indra/newview/skins/default/xui/pl/menu_login.xml | 4 +- indra/newview/skins/default/xui/pl/menu_navbar.xml | 4 +- .../skins/default/xui/pl/menu_outfit_gear.xml | 4 +- .../skins/default/xui/pl/menu_participant_list.xml | 4 +- .../skins/default/xui/pl/menu_people_groups.xml | 2 +- .../xui/pl/menu_people_groups_view_sort.xml | 4 +- .../skins/default/xui/pl/menu_people_nearby.xml | 6 +- .../xui/pl/menu_people_nearby_multiselect.xml | 4 +- .../skins/default/xui/pl/menu_picks_plus.xml | 2 +- indra/newview/skins/default/xui/pl/menu_place.xml | 4 +- .../skins/default/xui/pl/menu_place_add_button.xml | 2 +- .../default/xui/pl/menu_places_gear_folder.xml | 2 +- .../default/xui/pl/menu_places_gear_landmark.xml | 4 +- indra/newview/skins/default/xui/pl/menu_slurl.xml | 4 +- .../default/xui/pl/menu_teleport_history_gear.xml | 2 +- .../skins/default/xui/pl/menu_text_editor.xml | 2 +- .../skins/default/xui/pl/menu_url_agent.xml | 2 +- .../skins/default/xui/pl/menu_url_group.xml | 4 +- .../skins/default/xui/pl/menu_url_inventory.xml | 2 +- .../skins/default/xui/pl/menu_url_parcel.xml | 2 +- .../skins/default/xui/pl/menu_url_slurl.xml | 2 +- .../skins/default/xui/pl/menu_url_teleport.xml | 2 +- indra/newview/skins/default/xui/pl/menu_viewer.xml | 358 ++++++------ .../skins/default/xui/pl/mime_types_mac.xml | 8 +- .../newview/skins/default/xui/pl/notifications.xml | 124 ++-- .../default/xui/pl/panel_active_object_row.xml | 4 +- .../default/xui/pl/panel_adhoc_control_panel.xml | 4 +- .../skins/default/xui/pl/panel_audio_device.xml | 10 +- .../default/xui/pl/panel_block_list_sidetray.xml | 6 +- .../skins/default/xui/pl/panel_bottomtray.xml | 12 +- .../skins/default/xui/pl/panel_bottomtray_lite.xml | 2 +- .../skins/default/xui/pl/panel_edit_alpha.xml | 10 +- .../skins/default/xui/pl/panel_edit_classified.xml | 10 +- .../skins/default/xui/pl/panel_edit_profile.xml | 4 +- .../skins/default/xui/pl/panel_edit_wearable.xml | 8 +- .../newview/skins/default/xui/pl/panel_friends.xml | 4 +- .../default/xui/pl/panel_group_control_panel.xml | 4 +- .../skins/default/xui/pl/panel_group_general.xml | 8 +- .../default/xui/pl/panel_group_info_sidetray.xml | 4 +- .../skins/default/xui/pl/panel_group_invite.xml | 6 +- .../default/xui/pl/panel_group_land_money.xml | 16 +- .../skins/default/xui/pl/panel_group_notices.xml | 8 +- .../skins/default/xui/pl/panel_group_notify.xml | 2 +- .../skins/default/xui/pl/panel_group_roles.xml | 40 +- .../newview/skins/default/xui/pl/panel_groups.xml | 2 +- .../default/xui/pl/panel_im_control_panel.xml | 2 +- .../skins/default/xui/pl/panel_landmark_info.xml | 8 +- indra/newview/skins/default/xui/pl/panel_login.xml | 2 +- .../xui/pl/panel_media_settings_general.xml | 10 +- .../xui/pl/panel_media_settings_permissions.xml | 8 +- .../skins/default/xui/pl/panel_my_profile.xml | 8 +- .../skins/default/xui/pl/panel_nearby_chat_bar.xml | 2 +- .../skins/default/xui/pl/panel_nearby_media.xml | 8 +- .../skins/default/xui/pl/panel_outfit_edit.xml | 2 +- .../pl/panel_outfits_inventory_gear_default.xml | 10 +- .../newview/skins/default/xui/pl/panel_people.xml | 18 +- .../skins/default/xui/pl/panel_place_profile.xml | 8 +- .../default/xui/pl/panel_preferences_advanced.xml | 8 +- .../default/xui/pl/panel_preferences_alerts.xml | 2 +- .../default/xui/pl/panel_preferences_general.xml | 14 +- .../default/xui/pl/panel_preferences_graphics1.xml | 16 +- .../default/xui/pl/panel_preferences_privacy.xml | 4 +- .../default/xui/pl/panel_preferences_setup.xml | 8 +- .../default/xui/pl/panel_preferences_sound.xml | 14 +- .../default/xui/pl/panel_prim_media_controls.xml | 12 +- .../newview/skins/default/xui/pl/panel_profile.xml | 4 +- .../skins/default/xui/pl/panel_region_covenant.xml | 2 +- .../skins/default/xui/pl/panel_region_estate.xml | 8 +- .../skins/default/xui/pl/panel_region_general.xml | 6 +- .../default/xui/pl/panel_region_general_layout.xml | 6 +- .../skins/default/xui/pl/panel_region_terrain.xml | 6 +- .../skins/default/xui/pl/panel_region_texture.xml | 4 +- .../skins/default/xui/pl/panel_script_ed.xml | 4 +- .../xui/pl/panel_script_limits_my_avatar.xml | 4 +- .../xui/pl/panel_script_limits_region_memory.xml | 4 +- .../skins/default/xui/pl/panel_side_tray.xml | 4 +- .../default/xui/pl/panel_stand_stop_flying.xml | 2 +- .../skins/default/xui/pl/panel_status_bar.xml | 6 +- .../newview/skins/default/xui/pl/role_actions.xml | 76 +-- .../skins/default/xui/pl/sidepanel_appearance.xml | 4 +- .../skins/default/xui/pl/sidepanel_item_info.xml | 4 +- .../skins/default/xui/pl/sidepanel_task_info.xml | 2 +- indra/newview/skins/default/xui/pl/strings.xml | 630 ++++++++++----------- .../skins/default/xui/pl/teleport_strings.xml | 14 +- 186 files changed, 1264 insertions(+), 1464 deletions(-) delete mode 100644 indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml create mode 100644 indra/newview/skins/default/xui/en/panel_bars.xml (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 5ba1fc9b21..2188c71ff9 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -113,7 +113,7 @@ reference="LtYellow" /> + reference="White" /> diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index cae6146880..b9bc45a10b 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -21,7 +21,7 @@ This string CHANGE2 is extracted. Just a test. changes. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. 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 6c1214f152..c9b013099b 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -67,7 +67,7 @@ height="150" name="chat_history" parse_highlights="true" - parse_urls="true" + allow_html="true" left="1" width="249"> 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 3b26c2ab59..ec097a8e87 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -25,7 +25,7 @@ single_instance="true" width="320"> + width="200"> Replace with: + width="175" /> + width="100"> Shortcut Key: + width="75" /> + width="75" /> + width="215"> + +http://pdp36.lindenlab.com:12777/ + unknown - - + name="postcard" /> + name="texture" /> + name="local" /> [SIZE] KB diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 514b0a501b..a96dbe3553 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2322,7 +2322,6 @@ even though the user gets a free copy. layout="topleft" left_pad="15" name="color trans" - text_readonly_color="LabelDisabledColor" top="6" width="110"> Transparency % @@ -2347,7 +2346,6 @@ even though the user gets a free copy. layout="topleft" left_delta="0" name="glow label" - text_readonly_color="LabelDisabledColor" top_pad="8" width="80"> Glow @@ -2378,7 +2376,6 @@ even though the user gets a free copy. layout="topleft" left="10" name="tex gen" - text_readonly_color="LabelDisabledColor" top_pad="5" width="90"> Mapping @@ -2407,7 +2404,6 @@ even though the user gets a free copy. layout="topleft" name="label shininess" left_pad="4" - text_readonly_color="LabelDisabledColor" top_pad="-36" width="90"> Shininess @@ -2444,7 +2440,6 @@ even though the user gets a free copy. layout="topleft" left_pad="4" name="label bumpiness" - text_readonly_color="LabelDisabledColor" top_pad="-36" width="90"> Bumpiness @@ -2570,8 +2565,7 @@ even though the user gets a free copy. height="10" layout="topleft" left="10" - name="rpt" - text_readonly_color="LabelDisabledColor" + name="tex scale" top_pad="4" width="200"> Repeats / Face @@ -2660,7 +2654,6 @@ even though the user gets a free copy. layout="topleft" left="10" name="tex offset" - text_readonly_color="LabelDisabledColor" width="200"> Texture Offset @@ -2744,9 +2737,9 @@ even though the user gets a free copy. follows="top|left" tool_tip="Edit this Media" height="12" - image_disabled="Icon_Gear_Background" - image_selected="Icon_Gear_Press" - image_unselected="Icon_Gear_Foreground" + image_disabled="Icon_Gear_Foreground" + image_selected="Icon_Gear_Background" + image_unselected="Icon_Gear_Press" layout="topleft" left_pad="10" name="edit_media" diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index eb2e7ea788..8aeec46ba3 100644 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -26,7 +26,7 @@ Owner [OWNER] Touch Sit - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml index 76f68c6d4b..8ec7689819 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml @@ -88,15 +88,6 @@ - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml index 77cc3910fd..3e38503e43 100644 --- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml @@ -94,9 +94,6 @@ - - - - @@ -126,9 +124,7 @@ - - - - - - - - @@ -593,7 +579,6 @@ - - - - - - - @@ -765,9 +744,7 @@ - - @@ -793,9 +770,7 @@ function="ToggleControl" parameter="ShowSelectionBeam" /> - - --> - - @@ -935,9 +908,7 @@ function="ShowHelp" parameter="report_bug" /> - - @@ -951,6 +922,17 @@ name="Advanced" tear_off="true" visible="false"> + + + + @@ -977,9 +959,7 @@ function="Floater.Show" parameter="window_size" /> - - @@ -1000,9 +980,7 @@ function="ToggleControl" parameter="DisableCameraConstraints" /> - - @@ -1033,9 +1011,7 @@ function="ToggleControl" parameter="CompressSnapshotsToDisk" /> - - - - @@ -1419,7 +1393,17 @@ function="Advanced.ToggleFeature" parameter="flexible" /> - + + + + + @@ -1447,9 +1431,7 @@ function="ToggleControl" parameter="MouseSmooth" /> - - - + + + + + - - - - - - - - - - - - - - - - - - - + - @@ -1699,7 +1662,6 @@ function="ToggleControl" parameter="QAMode" /> - - - @@ -1814,9 +1774,7 @@ function="Advanced.DumpInfoToConsole" parameter="capabilities" /> - - @@ -1904,9 +1862,7 @@ function="ToggleControl" parameter="DebugShowColor" /> - - - - - - - + label="Deferred Rendering" + name="Deferred Rendering"> @@ -2230,31 +2181,7 @@ function="Advanced.EnableRenderDeferred" /> - - - - - - - - - - + function="Advanced.EnableRenderDeferredGI" /> - - @@ -2289,24 +2214,14 @@ parameter="RenderDebugPipeline" /> - - - - + label="Fast Alpha" + name="Fast Alpha"> + parameter="RenderFastAlpha" /> + parameter="RenderFastAlpha" /> - - @@ -2420,9 +2333,7 @@ - - @@ -2443,9 +2354,7 @@ function="ToggleControl" parameter="PingInterpolate" /> - - - @@ -2979,9 +2887,7 @@ function="Advanced.DumpAvatarLocalTextures" /> - - @@ -3018,9 +2924,7 @@ function="ToggleControl" parameter="ShowConsoleWindow" /> - - @@ -3355,9 +3259,7 @@ name="PublicIssueTrackerHelp_url" parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" /> - - diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml index 5feac53c33..8af2e1eaca 100644 --- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml @@ -13,7 +13,7 @@ layout="topleft" name="wear_wear"> + function="Wearable.Add" /> - - - - - - - - - [QUESTION] - - - - diff --git a/indra/newview/skins/default/xui/en/panel_bars.xml b/indra/newview/skins/default/xui/en/panel_bars.xml new file mode 100644 index 0000000000..96722ce278 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_bars.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml index 216a265164..4f989a6f6f 100644 --- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml @@ -41,7 +41,7 @@ height="16" layout="topleft" left_pad="5" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 17e8d4d2df..9124ad528d 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -21,7 +21,7 @@ top="3" width="18" /> - + 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 268cb4e5f9..e66cf400b4 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -202,7 +202,7 @@ value="Category:" width="140" />