diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
55 files changed, 298 insertions, 500 deletions
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 @@ <string name="test_the_vlt">This string CHANGE2 is extracted.</string> <string name="testing_eli">Just a test. changes.</string> <chat_history - parse_urls="true" + allow_html="true" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" border_visible="false" diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index f4d65bdb3a..b5be03346e 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -73,7 +73,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number help_topic="about_support_tab" name="support_panel"> <text_editor - parse_urls="true" + allow_html="true" follows="top|left" font="SansSerif" height="343" diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index 9864083442..887cedc33f 100644 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml @@ -244,6 +244,7 @@ layout="topleft" left="6" name="event_desc" + textbox.label="More" width="322"> 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.</expandable_text> </layout_panel> 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"> </chat_history> 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"> <chat_history - parse_urls="true" + allow_html="true" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" follows="all" diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index 1903401988..691472633e 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -96,19 +96,19 @@ name="replace_text" tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture!" top_pad="10" - width="210"> + width="200"> Replace with: </text> <line_editor follows="left|top" height="20" layout="topleft" - left_delta="99" + left_delta="89" max_length="31" name="replace_editor" tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture" top_delta="-4" - width="165" /> + width="175" /> <text type="string" length="1" @@ -120,25 +120,25 @@ font.style="BOLD" name="key_label" top_pad="10" - width="150"> + width="100"> Shortcut Key: </text> <combo_box height="20" label="None" layout="topleft" - left_delta="154" + left_delta="89" name="modifier_combo" top_delta="-4" - width="55" /> + width="75" /> <combo_box height="20" label="None" layout="topleft" - left_pad="4" + left_pad="10" name="key_combo" top_delta="0" - width="50" /> + width="75" /> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index e5a5fab9b9..0e8eef2a21 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -71,7 +71,7 @@ left="4" max_length="65536" name="Notecard Editor" - parse_urls="false" + allow_html="false" tab_group="1" top="46" width="392" diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index 354f1de85e..49b3b58113 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -22,7 +22,7 @@ Done </floater.string> <layout_stack - height="580" + bottom="595" follows="left|right|top|bottom" layout="topleft" left="10" @@ -30,7 +30,6 @@ top="20" width="630"> <layout_panel - height="570" layout="topleft" left_delta="0" top_delta="0" @@ -38,12 +37,13 @@ user_resize="false" width="630"> <web_browser + bottom="-10" follows="left|right|top|bottom" layout="topleft" left="0" name="browser" top="0" - height="540" + height="555" width="630" /> <text follows="bottom|left" @@ -51,7 +51,7 @@ layout="topleft" left_delta="0" name="status_text" - top_pad="10" + top_pad="7" width="150" /> <text visible="false" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 857932e51a..452b2ac664 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -4,52 +4,48 @@ can_minimize="false" can_close="true" follows="left|top" - height="520" + height="516" layout="topleft" name="Snapshot" help_topic="snapshot" save_rect="true" save_visibility="true" title="SNAPSHOT PREVIEW" - width="215"> + width="215"> + <floater.string + name="share_to_web_url" translate="false"> +http://pdp36.lindenlab.com:12777/ + </floater.string> <floater.string name="unknown"> unknown </floater.string> <radio_group - height="70" + height="58" label="Snapshot type" layout="topleft" left="10" name="snapshot_type_radio" - top="20" + top="25" width="205"> -<!-- <radio_item - height="16" - label="Share to Web" - layout="topleft" - name="share_to_web" - top_pad="0" /> ---> - <radio_item + bottom="19" height="16" label="Email" layout="topleft" - name="postcard" - top_pad="2" /> + name="postcard" /> <radio_item + bottom="38" height="16" label="My inventory (L$[AMOUNT])" layout="topleft" - name="texture" - top_pad="2" /> + name="texture" /> <radio_item + bottom="57" height="16" label="Save to my computer" layout="topleft" - name="local" - top_pad="2" /> + name="local" /> </radio_group> <ui_ctrl height="90" @@ -71,7 +67,7 @@ left_delta="0" halign="right" name="file_size_label" - top_pad="8" + top_pad="10" width="195"> [SIZE] KB </text> 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 </text> @@ -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] <string name="Touch">Touch</string> <string name="Sit">Sit</string> <text - parse_urls="false" + allow_html="false" follows="all" font="SansSerifLarge" height="30" diff --git a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml deleted file mode 100644 index 1925d3396f..0000000000 --- a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<menu - layout="topleft" - name="Add Wearable Gear Menu"> - <menu_item_check - label="Sort by Most Recent" - layout="topleft" - name="sort_by_most_recent"> - <on_check - function="AddWearable.Gear.Check" - parameter="by_most_recent" /> - <on_click - function="AddWearable.Gear.Sort" - parameter="by_most_recent" /> - </menu_item_check> - <menu_item_check - label="Sort by Name" - layout="topleft" - name="sort_by_name"> - <on_check - function="AddWearable.Gear.Check" - parameter="by_name" /> - <on_click - function="AddWearable.Gear.Sort" - parameter="by_name" /> - </menu_item_check> - <menu_item_check - label="Sort by Type" - layout="topleft" - name="sort_by_type"> - <on_check - function="AddWearable.Gear.Check" - parameter="by_type" /> - <on_click - function="AddWearable.Gear.Sort" - parameter="by_type" /> - <on_visible - function="AddWearable.Gear.Visible" - parameter="by_type" /> - </menu_item_check> -</menu> 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 @@ -89,15 +89,6 @@ function="Object.EnableWear" /> </menu_item_call> <menu_item_call - label="Add" - layout="topleft" - name="add"> - <menu_item_call.on_click - function="Object.AttachAddToAvatar" /> - <menu_item_call.on_visible - function="Object.EnableWear" /> - </menu_item_call> - <menu_item_call label="Report" layout="topleft" name="report"> diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index 31f70d99ca..b6cc222e96 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -83,15 +83,6 @@ <menu_item_call.on_enable function="Object.EnableWear" /> </menu_item_call> - <menu_item_call - enabled="false" - label="Add" - name="Add"> - <menu_item_call.on_click - function="Object.AttachAddToAvatar" /> - <menu_item_call.on_enable - function="Object.EnableWear" /> - </menu_item_call> <context_menu label="Attach ▶" name="Object Attach" /> 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 @@ <on_enable function="Places.LandmarksGear.Enable" parameter="expand" /> - <on_visible - function="Places.LandmarksGear.Enable" - parameter="expand" /> </menu_item_call> <menu_item_call label="Collapse" @@ -108,9 +105,6 @@ <on_enable function="Places.LandmarksGear.Enable" parameter="collapse" /> - <on_visible - function="Places.LandmarksGear.Enable" - parameter="collapse" /> </menu_item_call> <menu_item_call label="Expand all folders" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 0b85074eb6..63ff7047b4 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -29,9 +29,7 @@ <menu_item_call.on_click function="BuyCurrency" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="My Profile" name="Profile"> @@ -126,9 +124,7 @@ <menu_item_call.on_click function="Advanced.LeaveAdminStatus" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Exit [APP_NAME]" name="Quit" @@ -157,9 +153,7 @@ function="SideTray.PanelPeopleTab" parameter="groups_panel" /> </menu_item_call> - <menu_item_separator/> - <!--menu_item_call label="Chat" name="Chat"> @@ -257,9 +251,7 @@ parameter="region_info" /> </menu_item_call> </menu> - <menu_item_separator/> - <menu_item_call label="Buy This Land" name="Buy Land"> @@ -356,9 +348,7 @@ control="NavBarShowParcelProperties" /> </menu_item_check> </menu> - <menu_item_separator/> - <menu_item_call label="Teleport Home" name="Teleport Home" @@ -397,9 +387,7 @@ parameter="ShowNavbarFavoritesPanel" /> </menu_item_check> <menu_item_separator/>--> - <menu_item_separator/> - <menu create_jump_keys="true" label="Sun" @@ -442,9 +430,7 @@ function="World.EnvSettings" parameter="default" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Environment Editor" name="Environment Editor"> @@ -593,7 +579,6 @@ </menu_item_call> </menu> <menu_item_separator/> - <menu_item_call label="Focus on Selection" name="Focus on Selection" @@ -614,9 +599,7 @@ <menu_item_call.on_enable function="Tools.SomethingSelectedNoHUD" /> </menu_item_call> - <menu_item_separator/> - <menu create_jump_keys="true" label="Object" @@ -718,9 +701,7 @@ function="EditableSelected" /> </menu_item_call> </menu> - <menu_item_separator/> - <menu create_jump_keys="true" label="Options" @@ -736,9 +717,7 @@ function="ToggleControl" parameter="DebugPermissions" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Select Only My Objects" name="Select Only My Objects"> @@ -765,9 +744,7 @@ <menu_item_check.on_click function="Tools.SelectBySurrounding" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Show Hidden Selection" name="Show Hidden Selection"> @@ -793,9 +770,7 @@ function="ToggleControl" parameter="ShowSelectionBeam" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Snap to Grid" name="Snap to Grid" @@ -919,9 +894,7 @@ function="Floater.Show" parameter="hud" /> </menu_item_call>--> - <menu_item_separator/> - <menu_item_call label="Report Abuse" name="Report Abuse"> @@ -935,9 +908,7 @@ function="ShowHelp" parameter="report_bug" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="About [APP_NAME]" name="About Second Life"> @@ -951,6 +922,17 @@ name="Advanced" tear_off="true" visible="false"> + <menu_item_check + label="Show Advanced Menu" + name="Show Advanced Menu" + shortcut="control|alt|shift|D"> + <on_check + function="CheckControl" + parameter="UseDebugMenus" /> + <on_click + function="ToggleControl" + parameter="UseDebugMenus" /> + </menu_item_check> <menu_item_call label="Stop Animating Me" name="Stop Animating My Avatar"> @@ -977,9 +959,7 @@ function="Floater.Show" parameter="window_size" /> </menu_item_call> - <menu_item_separator/> - <menu_item_check label="Limit Select Distance" name="Limit Select Distance"> @@ -1000,9 +980,7 @@ function="ToggleControl" parameter="DisableCameraConstraints" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="High-res Snapshot" name="HighResSnapshot"> @@ -1033,9 +1011,7 @@ function="ToggleControl" parameter="CompressSnapshotsToDisk" /> </menu_item_check> - <menu_item_separator/> - <menu create_jump_keys="true" label="Performance Tools" @@ -1148,9 +1124,7 @@ <menu_item_check.on_click function="View.ShowHoverTips" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Show Land Tooltips" name="Land Tips"> @@ -1419,7 +1393,17 @@ function="Advanced.ToggleFeature" parameter="flexible" /> </menu_item_check> - </menu> + </menu> + <menu_item_check + label="Run Multiple Threads" + name="Run Multiple Threads"> + <menu_item_check.on_check + function="CheckControl" + parameter="RunMultipleThreads" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RunMultipleThreads" /> + </menu_item_check> <menu_item_check label="Use Plugin Read Thread" name="Use Plugin Read Thread"> @@ -1447,9 +1431,7 @@ function="ToggleControl" parameter="MouseSmooth" /> </menu_item_check> - <menu_item_separator/> - <menu label="Shortcuts" name="Shortcuts" @@ -1493,9 +1475,19 @@ <menu_item_call.on_click function="View.DefaultUISize" /> </menu_item_call> - + <!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility. The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. --> + <menu_item_check + label="Show Advanced Menu - legacy shortcut" + name="Show Advanced Menu - legacy shortcut" + shortcut="control|alt|D"> + <on_check + function="CheckControl" + parameter="UseDebugMenus" /> + <on_click + function="ToggleControl" + parameter="UseDebugMenus" /> + </menu_item_check> <menu_item_separator/> - <menu_item_check label="Always Run" name="Always Run" @@ -1516,9 +1508,7 @@ <menu_item_check.on_enable function="Agent.enableFlying" /> </menu_item_check> - <menu_item_separator/> - <menu_item_call label="Close Window" name="Close Window" @@ -1537,9 +1527,7 @@ <menu_item_call.on_enable function="File.EnableCloseAllWindows" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Snapshot to Disk" name="Snapshot to Disk" @@ -1548,9 +1536,7 @@ <menu_item_call.on_click function="File.TakeSnapshotToDisk" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Mouselook" name="Mouselook" @@ -1587,9 +1573,7 @@ <menu_item_call.on_enable function="View.EnableLastChatter" /> </menu_item_call> - <menu_item_separator/> - <menu create_jump_keys="true" label="Select Build Tool" @@ -1636,9 +1620,7 @@ parameter="land" /> </menu_item_call> </menu> - <menu_item_separator/> - <menu_item_call label="Zoom In" name="Zoom In" @@ -1660,27 +1642,8 @@ <menu_item_call.on_click function="View.ZoomOut" /> </menu_item_call> - <menu_item_separator - visible="false"/> - <!-- Made invisible to avoid a dissonance: menu item toggle menu where it is located. EXT-8069. - Can't be removed to keep sortcut workable. - --> - <menu_item_check - label="Show Advanced Menu" - name="Show Advanced Menu" - shortcut="control|alt|D" - visible="false"> - <on_check - function="CheckControl" - parameter="UseDebugMenus" /> - <on_click - function="ToggleControl" - parameter="UseDebugMenus" /> - </menu_item_check> - </menu> <!--Shortcuts--> - + </menu> <menu_item_separator/> - <menu_item_call label="Show Debug Settings" name="Debug Settings"> @@ -1699,7 +1662,6 @@ function="ToggleControl" parameter="QAMode" /> </menu_item_check> - </menu> <menu create_jump_keys="true" @@ -1790,9 +1752,7 @@ function="Advanced.ToggleConsole" parameter="memory view" /> </menu_item_check> - <menu_item_separator/> - <menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"> @@ -1814,9 +1774,7 @@ function="Advanced.DumpInfoToConsole" parameter="capabilities" /> </menu_item_call> - <menu_item_separator/> - <menu_item_check label="Camera" name="Camera"> @@ -1904,9 +1862,7 @@ function="ToggleControl" parameter="DebugShowColor" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Show Updates to Objects" name="Show Updates" @@ -1918,9 +1874,7 @@ function="Advanced.ToggleShowObjectUpdates" /> </menu_item_check> </menu> - <menu_item_separator/> - <menu create_jump_keys="true" label="Force an Error" @@ -2214,12 +2168,9 @@ <menu_item_check.on_enable function="Advanced.EnableRenderFBO" /> </menu_item_check> - - <menu_item_separator /> - <menu_item_check - label="Lighting and Shadows" - name="Lighting and Shadows"> + label="Deferred Rendering" + name="Deferred Rendering"> <menu_item_check.on_check function="CheckControl" parameter="RenderDeferred" /> @@ -2230,31 +2181,7 @@ function="Advanced.EnableRenderDeferred" /> </menu_item_check> <menu_item_check - label=" Shadows from Sun/Moon/Projectors" - name="Shadows from Sun/Moon/Projectors"> - <menu_item_check.on_check - function="Advanced.CheckRenderShadowOption" - parameter="RenderShadowDetail" /> - <menu_item_check.on_click - function="Advanced.ClickRenderShadowOption" - parameter="RenderShadowDetail" /> - <menu_item_check.on_enable - function="Advanced.EnableRenderDeferredOptions" /> - </menu_item_check> - <menu_item_check - label=" SSAO and Shadow Smoothing" - name="SSAO and Shadow Smoothing"> - <menu_item_check.on_check - function="CheckControl" - parameter="RenderDeferredSSAO" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="RenderDeferredSSAO" /> - <menu_item_check.on_enable - function="Advanced.EnableRenderDeferredOptions" /> - </menu_item_check> - <menu_item_check - label=" Global Illumination (experimental)" + label="Global Illumination" name="Global Illumination"> <menu_item_check.on_check function="CheckControl" @@ -2263,11 +2190,9 @@ function="ToggleControl" parameter="RenderDeferredGI" /> <menu_item_check.on_enable - function="Advanced.EnableRenderDeferredOptions" /> + function="Advanced.EnableRenderDeferredGI" /> </menu_item_check> - <menu_item_separator /> - <menu_item_check label="Debug GL" name="Debug GL"> @@ -2289,24 +2214,14 @@ parameter="RenderDebugPipeline" /> </menu_item_check> <menu_item_check - label="Automatic Alpha Masks (deferred)" - name="Automatic Alpha Masks (deferred)"> - <menu_item_check.on_check - function="CheckControl" - parameter="RenderAutoMaskAlphaDeferred" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="RenderAutoMaskAlphaDeferred" /> - </menu_item_check> - <menu_item_check - label="Automatic Alpha Masks (non-deferred)" - name="Automatic Alpha Masks (non-deferred)"> + label="Fast Alpha" + name="Fast Alpha"> <menu_item_check.on_check function="CheckControl" - parameter="RenderAutoMaskAlphaNonDeferred" /> + parameter="RenderFastAlpha" /> <menu_item_check.on_click function="ToggleControl" - parameter="RenderAutoMaskAlphaNonDeferred" /> + parameter="RenderFastAlpha" /> </menu_item_check> <menu_item_check label="Animation Textures" @@ -2349,7 +2264,7 @@ parameter="AuditTexture" /> </menu_item_check> <menu_item_check - label="Texture Atlas (experimental)" + label="Texture Atlas" name="Texture Atlas"> <menu_item_check.on_check function="CheckControl" @@ -2405,9 +2320,7 @@ function="ToggleControl" parameter="AgentPause" /> </menu_item_check> - <menu_item_separator/> - <menu_item_call label="Enable Message Log" name="Enable Message Log"> @@ -2420,9 +2333,7 @@ <menu_item_call.on_click function="Advanced.DisableMessageLog" /> </menu_item_call> - <menu_item_separator/> - <menu_item_check label="Velocity Interpolate Objects" name="Velocity Interpolate Objects"> @@ -2443,9 +2354,7 @@ function="ToggleControl" parameter="PingInterpolate" /> </menu_item_check> - <menu_item_separator/> - <menu_item_call label="Drop a Packet" name="Drop a Packet" @@ -2633,7 +2542,6 @@ </menu_item_check> <menu_item_separator /> - <menu_item_check label="Debug SelectMgr" name="Debug SelectMgr"> @@ -2979,9 +2887,7 @@ function="Advanced.DumpAvatarLocalTextures" /> </menu_item_call> </menu> - <menu_item_separator/> - <menu_item_check label="HTTP Textures" name="HTTP Textures"> @@ -3018,9 +2924,7 @@ function="ToggleControl" parameter="ShowConsoleWindow" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Show Admin Menu" name="View Admin Options"> @@ -3355,9 +3259,7 @@ name="PublicIssueTrackerHelp_url" parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Bug Reporting 101" name="Bug Reporing 101"> 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"> <on_click - function="Wearable.Wear" /> + function="Wearable.Add" /> </menu_item_call> <menu_item_call label="Add" diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml index 2d54e69601..85505f9972 100644 --- a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml @@ -3,24 +3,6 @@ layout="topleft" name="Wearing"> <menu_item_call - label="Take Off" - layout="topleft" - name="take_off"> - <on_click - function="Wearing.TakeOff" /> - </menu_item_call> - <menu_item_call - label="Detach" - layout="topleft" - name="detach"> - <on_click - function="Wearing.Detach" - parameter="detach"/> - </menu_item_call> - <menu_item_separator - layout="topleft" - name="edit_outfit_separator" /> - <menu_item_call label="Edit Outfit" layout="topleft" name="edit"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 609a9b09be..3576462cca 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4023,19 +4023,6 @@ Are you sure you want to quit? <notification icon="alertmodal.tga" - name="DeleteItems" - type="alertmodal"> - [QUESTION] - <usetemplate - ignoretext="Confirm before deleting items" - name="okcancelignore" - notext="Cancel" - yestext="OK"/> - <unique/> - </notification> - - <notification - icon="alertmodal.tga" name="HelpReportAbuseEmailLL" type="alert"> Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards]. diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml index 20ff492c0f..06bd1e9ff4 100644 --- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml @@ -9,7 +9,6 @@ layout="topleft" name="Mockup Tab" selection_enabled="true" - tab_stop="false" title="Mockup Tab" translate="false" width="0"> 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 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|right|top|bottom" + height="768" + layout="topleft" + left="0" + mouse_opaque="false" + name="screen" + width="1024"> + <layout_stack name="menu_stack" orientation="vertical" height="768" border_size="0"> + <panel auto_resize="false" width="1024" name="status_bar" filename="panel_status_bar.xml"/> + <panel auto_resize="false" width="1024" height="60" name="navigation bar" filename="panel_navigation_bar.xml"/> + <layout_stack name="hud_stack" orientation="horizontal" auto_resize="true" width="1024" height="500" follows="all"> + <panel auto_resize="true" name="floater_view" height="500"/> + <panel auto_resize="false" filename="panel_side_tray.xml" height="500" width="333"/> + </layout_stack> + </layout_stack> +</panel> 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" /> <text - parse_urls="false" + allow_html="false" allow_scroll="false" v_pad = "7" read_only = "true" @@ -38,17 +38,16 @@ use_ellipses="true" valign="bottom" value="Ericag Vader" /> - <text - allow_scroll="false" - font="SansSerifSmall" - follows="right" - halign="right" - height="13" - layout="topleft" - left_pad="5" - name="time_box" - right="-5" - top="8" - value="23:30" - width="110" /> + <text + font="SansSerifSmall" + follows="right" + halign="right" + height="13" + layout="topleft" + left_pad="5" + name="time_box" + right="-5" + top="8" + value="23:30" + width="110" /> </panel> 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" /> <text_editor - parse_urls="true" + allow_html="true" allow_scroll="false" bg_visible="false" follows="left|top|right" @@ -371,7 +371,7 @@ value="Description:" width="250" /> <text_editor - parse_urls="true" + allow_html="true" allow_scroll="true" bg_visible="false" follows="all" diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml index 27c653bc35..e390b9e836 100644 --- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml @@ -65,6 +65,7 @@ left="103" name="description" textbox.max_length="1024" + textbox.label="More" textbox.show_context_menu="false" top_pad="0" width="178" diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml index cc0541e65c..93d7720c57 100644 --- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml @@ -53,7 +53,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_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml index de2ff0afc9..75b5fd1532 100644 --- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml @@ -53,7 +53,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_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml index df459b4083..a5dd34bd22 100644 --- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml @@ -42,7 +42,7 @@ height="16" layout="topleft" left_pad="5" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="LtGray_50" diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml index ab34cbf20e..b674b39d9b 100644 --- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml @@ -36,7 +36,7 @@ top="2" width="20" /> <text - parse_urls="false" + allow_html="false" follows="left|right" font="SansSerifSmall" height="15" diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml index 6f271a757c..65b2e81d50 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml @@ -50,7 +50,7 @@ width="230" /> </panel> <text_editor - parse_urls="true" + allow_html="true" enabled="true" follows="all" height="0" diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 4af4774304..18a2f37ba2 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -103,7 +103,7 @@ clicking on their names. height="23" follows="top|left" label="Invite" - left="5" + left="0" name="member_invite" width="100" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml index 2e38835810..f1b7b92ece 100644 --- a/indra/newview/skins/default/xui/en/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/en/panel_inventory_item.xml @@ -41,7 +41,7 @@ height="20" 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_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index c5d6aced7a..a0a1e2963a 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -139,6 +139,7 @@ layout="topleft" left="10" name="description" + textbox.label="More" top_pad="10" value="Du waltz die spritz" width="280" /> @@ -235,7 +236,7 @@ value="Title:" width="290" /> <text - parse_urls="false" + allow_html="false" follows="left|top" height="22" layout="topleft" @@ -275,7 +276,7 @@ name="notes_editor" read_only="true" text_readonly_color="white" - text_type="ascii_with_newline" + text_type="ascii" top_pad="5" width="290" wrap="true" /> diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml index d3a58fed58..c5f44cd049 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml @@ -16,8 +16,7 @@ follows="top|left" height="15" left="10" - name="controls_label" - text_readonly_color="LabelDisabledColor"> + name="controls_label"> Controls: </text> <combo_box @@ -47,8 +46,7 @@ follows="top|left" height="15" left="10" - name="owner_label" - text_readonly_color="LabelDisabledColor"> + name="owner_label"> Owner </text> @@ -85,9 +83,8 @@ enabled="false" follows="top|left" height="15" - left="10" - name="group_label" - text_readonly_color="LabelDisabledColor"> + left="10" + name="group_label"> Group: </text> @@ -98,7 +95,6 @@ font="SansSerif" height="20" left="60" name="perms_group_name" - text_readonly_color="LabelDisabledColor" value ="" width="200" /> @@ -136,8 +132,7 @@ follows="top|left" height="15" left="10" - name="anyone_label" - text_readonly_color="LabelDisabledColor"> + name="anyone_label"> Anyone </text> 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 4629bb9cfe..2e49fc8d6f 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -118,6 +118,7 @@ layout="topleft" left="107" textbox.max_length="512" + textbox.label="More" textbox.show_context_menu="true" name="sl_description_edit" top_pad="-3" @@ -174,6 +175,7 @@ layout="topleft" left="107" textbox.max_length="512" + textbox.label="More" textbox.show_context_menu="true" name="fl_description_edit" top_pad="-3" @@ -315,6 +317,7 @@ name="sl_groups" top_pad="0" translate="false" + textbox.label="More" textbox.show_context_menu="true" width="298" expanded_bg_visible="true" diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 082d51ed3c..2c9d7e4b6a 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -97,8 +97,6 @@ name="location_combo" top_delta="0" width="266"> - <combo_list - mouse_wheel_opaque="true"/> <!-- *TODO: Delete. Let the location_input use the correct art sizes. <location_input.add_landmark_button height="18" diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 59ead84127..34738745eb 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -78,7 +78,7 @@ width="285" wrap="true" parse_highlights="true" - parse_urls="true"/> + allow_html="true"/> </panel> <panel background_visible="false" diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 95c8cb301d..f6f1c33fe3 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -101,7 +101,7 @@ follows="all" height="100" width="280" - parse_urls="true" + allow_html="true" hide_scrollbar="false" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index de147908d8..292bd47207 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -65,6 +65,7 @@ left="103" name="picture_descr" textbox.max_length="1024" + textbox.label="More" textbox.show_context_menu="false" top_pad="0" width="178" 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 c6e93af50a..35e8075896 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -264,7 +264,7 @@ </layout_panel> </layout_stack> <text - parse_urls="false" + allow_html="false" follows="left|top|right" font="SansSerifLarge" height="14" @@ -277,7 +277,7 @@ value="SampleRegion" width="290" /> <text - parse_urls="false" + allow_html="false" follows="left|top|right" height="14" layout="topleft" @@ -293,6 +293,7 @@ layout="topleft" left="5" name="description" + textbox.label="More" top_pad="10" value="Du waltz die spritz" width="300" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 113d5fb6dc..f4694180a1 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -155,7 +155,7 @@ visiblity_control="ShowAdvancedGraphicsSettings" border="false" follows="top|left" - height="283" + height="260" label="CustomGraphics" layout="topleft" left="5" @@ -211,112 +211,119 @@ <check_box.commit_callback function="Pref.VertexShaderEnable" /> </check_box> -<!-- DISABLED UNTIL WE REALLY WANT TO SUPPORT THIS - <check_box - control_name="RenderDeferred" + <check_box + control_name="RenderWaterReflections" height="16" initial_value="true" - label="Lighting and Shadows" + label="Water reflections" layout="topleft" left_delta="0" - name="UseLightShaders" + name="Reflections" top_pad="1" width="256"> - <check_box.commit_callback + <check_box.commit_callback function="Pref.VertexShaderEnable" /> - </check_box> - <check_box - control_name="RenderDeferredSSAO" + </check_box> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="0" + name="ReflectionDetailText" + top_pad="7" + width="128"> + Reflection detail: + </text> + <radio_group + control_name="RenderReflectionDetail" + draw_border="false" + height="70" + layout="topleft" + left_delta="-2" + name="ReflectionDetailRadio" + top_pad="3" + width="321"> + <radio_item + height="16" + label="Terrain and trees" + layout="topleft" + left="3" + name="0" + top="3" + width="315" /> + <radio_item + height="16" + label="All static objects" + layout="topleft" + left_delta="0" + name="1" + top_delta="16" + width="315" /> + <radio_item + height="16" + label="All avatars and objects" + layout="topleft" + left_delta="0" + name="2" + top_delta="16" + width="315" /> + <radio_item + height="16" + label="Everything" + layout="topleft" + left_delta="0" + name="3" + top_delta="16" + width="315" /> + </radio_group> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="2" + name="AvatarRenderingText" + top_pad="5" + width="158"> + Avatar rendering: + </text> + <check_box + control_name="RenderUseImpostors" + height="16" + initial_value="true" + label="Avatar impostors" + layout="topleft" + left_delta="0" + name="AvatarImpostors" + top_pad="7" + width="256" /> + <check_box + control_name="RenderAvatarVP" height="16" initial_value="true" - label="Ambient Occlusion" + label="Hardware skinning" layout="topleft" left_delta="0" - name="UseSSAO" + name="AvatarVertexProgram" top_pad="1" width="256"> - <check_box.commit_callback + <check_box.commit_callback function="Pref.VertexShaderEnable" /> - </check_box> + </check_box> + <check_box + control_name="RenderAvatarCloth" + height="16" + initial_value="true" + label="Avatar cloth" + layout="topleft" + left_delta="0" + name="AvatarCloth" + top_pad="1" + width="256" /> - <text - type="string" - length="1" - top_pad="8" - follows="top|left" - height="23" - width="110" - word_wrap="true" - layout="topleft" - left="10" - name="shadows_label"> - Shadows: - </text> - <combo_box - control_name="RenderShadowDetail" - height="23" - layout="topleft" - left="10" - top_pad="0" - name="ShadowDetail" - width="150"> - <combo_box.item - label="None" - name="0" - value="0"/> - <combo_box.item - label="Sun/Moon" - name="1" - value="1"/> - <combo_box.item - label="Sun/Moon + Projectors" - name="2" - value="2"/> - </combo_box> ---> - <text - type="string" - length="1" - top_pad="8" - follows="top|left" - height="23" - width="110" - word_wrap="true" - layout="topleft" - left="10" - name="reflection_label"> - Water Reflections: - </text> - <combo_box - control_name="RenderReflectionDetail" - height="23" - layout="topleft" - left_="10" - top_pad ="0" - name="Reflections" - width="150"> - <combo_box.item - label="Minimal" - name="0" - value="0"/> - <combo_box.item - label="Terrain and trees" - name="1" - value="1"/> - <combo_box.item - label="All static objects" - name="2" - value="2"/> - <combo_box.item - label="All avatars and objects" - name="3" - value="3"/> - <combo_box.item - label="Everything" - name="4" - value="4"/> - </combo_box> - <slider control_name="RenderFarClip" decimal_digits="0" @@ -608,58 +615,49 @@ width="128"> Low </text> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left_delta="-260" - name="AvatarRenderingText" + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="200" + name="LightingDetailText" top_pad="18" - width="128"> - Avatar rendering: - </text> - <check_box - control_name="RenderUseImpostors" - height="16" - initial_value="true" - label="Avatar impostors" - layout="topleft" - left_delta="0" - name="AvatarImpostors" - top_pad="7" - width="256" /> - <check_box - control_name="RenderAvatarVP" - height="16" - initial_value="true" - label="Hardware skinning" - layout="topleft" - left_delta="0" - name="AvatarVertexProgram" - top_pad="1" - width="256"> - <check_box.commit_callback - function="Pref.VertexShaderEnable" /> - </check_box> - <check_box - control_name="RenderAvatarCloth" - height="16" - initial_value="true" - label="Avatar cloth" - layout="topleft" - left_delta="0" - name="AvatarCloth" - top_pad="1" - width="256" /> + width="140"> + Lighting detail: + </text> + <radio_group + control_name="RenderLightingDetail" + draw_border="false" + height="38" + layout="topleft" + name="LightingDetailRadio" + top_pad="5" + width="200"> + <radio_item + height="16" + label="Sun and moon only" + layout="topleft" + name="SunMoon" + value="0" + top="3" + width="156" /> + <radio_item + height="16" + label="Nearby local lights" + layout="topleft" + name="LocalLights" + value="1" + top_delta="16" + width="156" /> + </radio_group> <text type="string" length="1" follows="left|top" height="12" layout="topleft" - left="358" left_pad="-30" name="TerrainDetailText" top="226" @@ -689,7 +687,7 @@ name="2" top_delta="16" width="50" /> - </radio_group> --> + </radio_group> </panel> <button diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index e41b80baf2..fc33836c79 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -108,6 +108,7 @@ layout="topleft" left="107" textbox.max_length="512" + textbox.label="More" textbox.show_context_menu="true" name="sl_description_edit" top_pad="-3" @@ -154,6 +155,7 @@ layout="topleft" left="107" textbox.max_length="512" + textbox.label="More" textbox.show_context_menu="true" name="fl_description_edit" top_pad="-3" @@ -293,6 +295,7 @@ left="7" name="sl_groups" textbox.max_length="512" + textbox.label="More" textbox.show_context_menu="true" top_pad="0" translate="false" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml index d38ad8c5f8..c5f3fcc27d 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -41,7 +41,7 @@ height="20" layout="topleft" left_pad="5" - parse_urls="false" + allow_html="false" use_ellipses="true" name="region" text_color="white" diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml index 30d3064e14..d8f4297e0c 100644 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml @@ -36,7 +36,7 @@ enabled="true" follows="right|top" height="18" - image_name="Parcel_VoiceNo_Dark" + image_name="Parcel_VoiceNo_Light" name="voice_icon" top="1" visible="false" @@ -45,7 +45,7 @@ <icon follows="right|top" height="18" - image_name="Parcel_FlyNo_Dark" + image_name="Parcel_FlyNo_Light" name="fly_icon" top="1" visible="false" @@ -54,7 +54,7 @@ <icon follows="right|top" height="18" - image_name="Parcel_PushNo_Dark" + image_name="Parcel_PushNo_Light" name="push_icon" top="1" visible="false" @@ -63,7 +63,7 @@ <icon follows="right|top" height="18" - image_name="Parcel_BuildNo_Dark" + image_name="Parcel_BuildNo_Light" name="build_icon" top="1" visible="false" @@ -72,7 +72,7 @@ <icon follows="right|top" height="18" - image_name="Parcel_ScriptsNo_Dark" + image_name="Parcel_ScriptsNo_Light" name="scripts_icon" top="1" visible="false" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 676bef2d0b..048de70045 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2282,9 +2282,6 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="accel-win-alt">Alt+</string> <string name="accel-win-shift">Shift+</string> - <string name="Esc">Esc</string> - <string name="Home">Home</string> - <!-- Previews --> <string name="FileSaved">File Saved</string> <string name="Receiving">Receiving</string> @@ -3027,9 +3024,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="conference-title"> Ad-hoc Conference </string> - <string name="conference-title-incoming"> - [AGENT_NAME] Conference - </string> <string name="inventory_item_offered-im"> Inventory item offered </string> @@ -3261,10 +3255,4 @@ Abuse Report</string> <string name="Notices">Notices</string> <string name="Chat">Chat</string> - <!-- Question strings for delete items notifications --> - <string name="DeleteItems">Delete selected items?</string> - <string name="DeleteItem">Delete selected item?</string> - - <string name="EmptyOutfitText">There are no items in this outfit</string> - </strings> diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml index 0eec002006..c08267de82 100644 --- a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml @@ -21,7 +21,7 @@ height="16" layout="topleft" left="21" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml index 96d72c78a6..f7a05e9bc4 100644 --- a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml @@ -21,7 +21,7 @@ height="16" layout="topleft" left="42" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" diff --git a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml index 0534485ddd..88a4682e13 100644 --- a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml @@ -33,7 +33,7 @@ height="16" layout="topleft" left="45" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml index 6c60624805..80a877a6c2 100644 --- a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml @@ -22,7 +22,7 @@ height="16" layout="topleft" left="41" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="LtGray_50" diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml index c6331ec87b..216c4dea95 100644 --- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml @@ -2,9 +2,10 @@ <expandable_text max_height="300" > <textbox - parse_urls="true" + allow_html="true" allow_scroll="true" bg_visible="false" + label="More" follows="left|top|right" name="text" read_only="true" diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml index da9059c819..0a5930c820 100644 --- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml @@ -32,7 +32,7 @@ height="20" layout="topleft" left="21" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index dd93675807..63166f32b7 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml @@ -12,7 +12,6 @@ draw_stripes="true" scroll_bar_bg_visible="false" scroll_bar_bg_color="black" - mouse_wheel_opaque="false" background_visible="true" heading_height="23" draw_border="false" diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml index 3878c7a144..bb46ec0954 100644 --- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <simple_text_editor - parse_urls="false" + allow_html="false" mouse_opaque="true" font="SansSerifSmall" max_length="255" @@ -15,13 +15,11 @@ default_color="TextDefaultColor" text_color="TextFgColor" text_readonly_color="TextFgReadOnlyColor" - text_selected_color="White" h_pad="6" v_pad="4" bg_visible="true" bg_readonly_color="TextBgReadOnlyColor" bg_writeable_color="TextBgWriteableColor" - bg_selected_color="EmphasisColor" bg_focus_color="TextBgFocusColor"> <simple_text_editor.border bevel_style="in" diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 134f2d7522..3006df22b8 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<text parse_urls="true" +<text allow_html="true" mouse_opaque="false" name="text_box" font="SansSerifSmall" @@ -8,7 +8,7 @@ halign="left" h_pad="0" allow_scroll="false" - text_readonly_color="LabelTextColor" + text_readonly_color="LabelDisabledColor" bg_writeable_color="FloaterDefaultBackgroundColor" use_ellipses="false" bg_visible="false" diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml index 180120ec89..2ced8b1b4b 100644 --- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Core parameters are in simple_text_editor.xml --> <text_editor - parse_urls="false" - text_readonly_color="LabelDisabledColor" + allow_html="false" show_context_menu="true"/> |