diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
69 files changed, 4460 insertions, 4261 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 6e985e0476..07cb4c12f5 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -414,7 +414,7 @@ right="-10" name="Cancel Land Sale" left_pad="5" - top_pad="-15" + top_pad="7" width="180" /> <text type="string" @@ -488,6 +488,7 @@ width="186"> 0 </text> + <button enabled="false" follows="left|top" @@ -495,9 +496,20 @@ label="Buy Land" layout="topleft" left_delta="52" + top_pad="5" name="Buy Land..." - top_pad="7" width="130" /> + <button + enabled="false" + follows="left|top" + height="23" + label="Linden Sale" + layout="topleft" + left="10" + name="Linden Sale..." + tool_tip="Land must be owned, set content, and not already for auction." + top_pad="-23" + width="150" /> <button enabled="true" follows="left|top" @@ -545,18 +557,7 @@ layout="topleft" left_delta="0" name="Reclaim Land..." - top_delta="-50" - width="180" /> - <button - enabled="false" - follows="left|top" - height="23" - label="Linden Sale" - layout="topleft" - left_delta="0" - name="Linden Sale..." - tool_tip="Land must be owned, set content, and not already for auction." - top_pad="2" + top_delta="-25" width="180" /> </panel> <panel @@ -1204,6 +1205,10 @@ Only large parcels can be listed in search. name="push_restrict_region_text"> No Pushing (Region Override) </panel.string> + <panel.string + name="see_avs_text"> + See and chat with residents on this parcel + </panel.string> <text type="string" length="1" @@ -1313,7 +1318,7 @@ Only large parcels can be listed in search. name="check group scripts" top_delta="0" width="70" /> - <text + <text type="string" text_color="white" length="1" @@ -1514,10 +1519,32 @@ Only large parcels can be listed in search. type="string" length="1" follows="left|top" + text_color="white" + height="16" + layout="topleft" + left="230" + top="174" + name="allow_label5" + width="278"> + Allow Residents on other parcels to: + </text> + <check_box + height="16" + label="See Avatars" + follows="top" + layout="topleft" + left="230" + name="SeeAvatarsCheck" + tool_tip="Allows residents on other parcels to see and chat with residents on this parcel, and you to see and chat with them." + width="120" /> + <text + type="string" + length="1" + follows="left|top" height="16" layout="topleft" - left="220" - top="180" + left="230" + top="230" text_color="white" name="landing_point" word_wrap="true" @@ -1531,7 +1558,7 @@ Only large parcels can be listed in search. label_selected="Set" layout="topleft" name="Set" - right="-68" + left="230" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar's location inside this parcel." width="50" /> <button @@ -1543,7 +1570,6 @@ Only large parcels can be listed in search. left_pad="5" name="Clear" tool_tip="Clear the landing point" - right="-10" width="55" /> <text type="string" @@ -1552,7 +1578,7 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="220" + left="230" top_pad="10" name="Teleport Routing: " width="200"> @@ -1845,6 +1871,34 @@ Only large parcels can be listed in search. name="check sound local" left_pad="0" width="292" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="Avatar Sounds:" + top_pad="10" + width="100"> + Avatar Sounds: + </text> + <check_box + height="16" + label="Everyone" + layout="topleft" + left_pad="0" + name="all av sound check" + top_delta="0" + width="130" /> + <check_box + height="16" + label="Group" + layout="topleft" + left_pad="0" + name="group av sound check" + top_delta="0" + width="70" /> <text type="string" length="1" @@ -2125,4 +2179,4 @@ Only large parcels can be listed in search. </panel> </panel> </tab_container> -</floater> +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml index 56230e912c..c247a12e7a 100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml @@ -2,27 +2,84 @@ <floater legacy_header_height="18" follows="right" - height="170" + height="198" layout="topleft" name="build options floater" help_topic="build_options_floater" save_rect="true" title="GRID OPTIONS" width="264"> + <floater.string + name="grid_screen_text"> + Screen + </floater.string> + <floater.string + name="grid_local_text"> + Local + </floater.string> + <floater.string + name="grid_world_text"> + World + </floater.string> + <floater.string + name="grid_reference_text"> + Reference + </floater.string> + <floater.string + name="grid_attachment_text"> + Attachment + </floater.string> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + tool_tip="Grid opacity" + name="grid_opacity_label" + top_pad="30" + width="123"> + Mode + </text> + <combo_box + height="23" + layout="topleft" + left_pad="9" + follows="left|top" + name="combobox grid mode" + tool_tip="Choose the type of grid ruler for positioning the object" + top_delta="-3" + width="108"> + <combo_box.item + label="World grid" + name="World" + value="World" /> + <combo_box.item + label="Local grid" + name="Local" + value="Local" /> + <combo_box.item + label="Reference grid" + name="Reference" + value="Reference" /> + <combo_box.commit_callback + function="GridOptions.gridMode"/> + </combo_box> <spinner control_name="GridResolution" follows="left|top" height="23" initial_value="1" - label="Grid Units (meters)" - label_width="160" + label="Units (meters)" + label_width="130" layout="topleft" left="10" max_val="5" min_val="0.01" name="GridResolution" - top="25" - width="230" /> + top_pad="4" + width="200" /> <spinner control_name="GridDrawSize" decimal_digits="1" @@ -30,15 +87,15 @@ height="23" increment="0.5" initial_value="5" - label="Grid Extents (meters)" - label_width="160" + label="Extents (meters)" + label_width="130" layout="topleft" left_delta="0" max_val="50" min_val="1" name="GridDrawSize" top_pad="0" - width="230" /> + width="200" /> <check_box control_name="GridSubUnit" height="16" diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 49deb9b025..49ca6cc8ba 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -247,10 +247,10 @@ Re-enter amount to see the latest exchange rate. follows="top|left" layout="topleft" halign="right" - top="213" + top="208" left="10" width="310" - height="30" + height="35" name="purchase_warning_repurchase"> Confirming this purchase only buys L$, not the object. </text> @@ -299,7 +299,7 @@ Re-enter amount to see the latest exchange rate. type="string" font="SansSerifHuge" left="165" - width="170" + width="360" height="25" top="25" name="info_cannot_buy"> diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index d5d4565ca1..ab81a86720 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -204,7 +204,7 @@ supports [AMOUNT2] objects follows="left|top" height="14" layout="topleft" - left_delta="110" + left_delta="125" name="region_name_text" top_delta="0" use_ellipses="true" @@ -237,7 +237,7 @@ supports [AMOUNT2] objects follows="left|top" height="14" layout="topleft" - left_delta="110" + left_delta="125" name="region_type_text" top_delta="0" width="175"> @@ -262,7 +262,7 @@ supports [AMOUNT2] objects follows="left|top" height="14" layout="topleft" - left_delta="110" + left_delta="125" name="estate_name_text" top_delta="0" width="175"> @@ -276,8 +276,8 @@ supports [AMOUNT2] objects layout="topleft" left="440" name="estate_owner_label" - right="550" - width="100" + right="565" + width="120" word_wrap="true"> Estate Owner: </text> @@ -287,7 +287,7 @@ supports [AMOUNT2] objects follows="left|top" height="20" layout="topleft" - left_delta="110" + left_delta="125" name="estate_owner_text" top_delta="0" width="175"> diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml deleted file mode 100644 index 65e2462ef8..0000000000 --- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml +++ /dev/null @@ -1,558 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="275" - layout="topleft" - name="Day Cycle Floater" - help_topic="day_cycle_floater" - save_rect="true" - title="DAY CYCLE EDITOR" - width="658"> - <tab_container - follows="left|top" - height="255" - layout="topleft" - left="0" - name="Day Cycle Tabs" - tab_position="top" - top="20" - width="656"> - <panel - border="true" - follows="left|top|right|bottom" - height="255" - label="Day Cycle" - layout="topleft" - left="1" - mouse_opaque="false" - name="Day Cycle" - top="0" - width="654"> - <multi_slider - can_edit_text="true" - control_name="WLTimeSlider" - decimal_digits="0" - draw_track="false" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left="20" - max_sliders="20" - max_val="24" - name="WLTimeSlider" - show_text="false" - top="25" - use_triangle="true" - width="525" /> - <multi_slider - can_edit_text="true" - control_name="WLDayCycleKeys" - decimal_digits="0" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left_delta="0" - max_sliders="20" - max_val="24" - name="WLDayCycleKeys" - show_text="false" - top_pad="15" - width="525" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left="8" - name="WL12am" - top="74" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL3am" - top_delta="0" - width="55"> - 3am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL6am" - top_delta="0" - width="55"> - 6am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL9amHash" - top_delta="0" - width="55"> - 9am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL12pmHash" - top_delta="0" - width="55"> - 12pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL3pm" - top_delta="0" - width="55"> - 3pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL6pm" - top_delta="0" - width="55"> - 6pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL9pm" - top_delta="0" - width="55"> - 9pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL12am2" - top_delta="0" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left="20" - name="WL12amHash" - top="54" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL3amHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL6amHash" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL9amHash2" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL12pmHash2" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL3pmHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL6pmHash" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL9pmHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL12amHash2" - top_delta="-3" - width="6"> - | - </text> - <button - height="20" - label="Add Key" - label_selected="Add Key" - layout="topleft" - left="555" - name="WLAddKey" - top="30" - width="96" /> - <button - height="20" - label="Delete Key" - label_selected="Delete Key" - layout="topleft" - left_delta="0" - name="WLDeleteKey" - top_pad="5" - width="96" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="20" - name="WLCurKeyFrameText" - top="104" - width="235"> - Key Frame Settings: - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="30" - name="WLCurKeyTimeText" - top="124" - width="105"> - Key Time: - </text> - <spinner - control_name="WLCurKeyHour" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - label="Hour" - label_width="35" - layout="topleft" - left_delta="20" - max_val="100" - name="WLCurKeyHour" - top_pad="4" - width="74" /> - <spinner - control_name="WLCurKeyMin" - decimal_digits="0" - follows="left|top" - height="16" - increment="5" - initial_value="0" - label="Min" - label_width="45" - layout="topleft" - left_pad="5" - max_val="55" - name="WLCurKeyMin" - top_delta="0" - width="85" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="30" - name="WLCurKeyTimeText2" - top="169" - width="185"> - Key Preset: - </text> - <combo_box - height="18" - label="Preset" - layout="topleft" - left_delta="0" - name="WLKeyPresets" - top_pad="7" - width="205" /> - <view_border - bevel_style="none" - follows="top|left" - height="115" - layout="topleft" - left="12" - top="101" - width="240" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="15" - name="DayCycleText" - top="114" - width="120"> - Snap: - </text> - <combo_box - enabled="false" - height="18" - label="5 min" - layout="topleft" - left_delta="0" - name="WLSnapOptions" - top_pad="7" - width="70" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="DayCycleText2" - top_pad="17" - width="120"> - Length of Cycle: - </text> - <spinner - control_name="WLLengthOfDayHour" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - label="Hour" - label_width="33" - layout="topleft" - left_delta="-3" - max_val="100" - name="WLLengthOfDayHour" - top_pad="4" - width="74" /> - <spinner - control_name="WLLengthOfDayMin" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - label="Min" - label_width="25" - layout="topleft" - left_pad="2" - max_val="59" - name="WLLengthOfDayMin" - top_delta="0" - width="65" /> - <spinner - control_name="WLLengthOfDaySec" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="24" - label="Sec" - label_width="25" - layout="topleft" - left_pad="2" - max_val="59" - name="WLLengthOfDaySec" - top_delta="0" - width="65"/> - <text - type="string" - halign="right" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-23" - name="DayCycleText3" - top="114" - width="85"> - Preview : - </text> - <button - height="20" - label="Play" - label_selected="Play" - layout="topleft" - left="480" - name="WLAnimSky" - top_pad="5" - width="83" /> - <button - height="20" - label="Stop!" - label_selected="Stop" - layout="topleft" - left_pad="4" - name="WLStopAnimSky" - top_delta="0" - width="83" /> - <button - height="20" - label="Use Estate Time" - label_selected="Go to Estate Time" - layout="topleft" - left="480" - name="WLUseLindenTime" - top_pad="9" - width="170" /> - <button - height="20" - label="Save Test Day" - label_selected="Save Test Day" - layout="topleft" - left_delta="0" - name="WLSaveDayCycle" - top_pad="9" - width="170" /> - <button - height="20" - label="Load Test Day" - label_selected="Load Test Day" - layout="topleft" - left_delta="0" - name="WLLoadDayCycle" - top_pad="3" - width="170" /> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml new file mode 100644 index 0000000000..b5de4166f6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<floater + legacy_header_height="18" + height="130" + help_topic="" + layout="topleft" + name="Delete Env Preset" + save_rect="true" + title="DELETE ENV PRESET" + width="550"> + + <string name="title_water">Delete Water Preset</string> + <string name="title_sky">Delete Sky Preset</string> + <string name="title_day_cycle">Delete Day Cycle</string> + + <string name="label_water">Preset:</string> + <string name="label_sky">Preset:</string> + <string name="label_day_cycle">Day cycle:</string> + + <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string> + <string name="msg_sky_is_referenced">Cannot remove a preset that is referenced by some day cycle(s).</string> + + <string name="combo_label">-Select a preset-</string> + + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="50" + name="label" + top="60" + width="60"> + Preset: + </text> + <combo_box + follows="top|left" + layout="topleft" + left_pad="10" + name="preset_combo" + top_delta="-5" + width="200"/> + <button + follows="bottom|right" + height="23" + label="Delete" + layout="topleft" + left_pad="15" + name="delete" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="5" + name="cancel" + width="70"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml new file mode 100644 index 0000000000..d9a3ad0c4b --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml @@ -0,0 +1,485 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="381" + layout="topleft" + name="Edit Day cycle" + help_topic="day_presets" + save_rect="true" + title="Edit Day Cycle" + width="705"> + + <string name="title_new">Create a New Day Cycle</string> + <string name="title_edit">Edit Day Cycle</string> + <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string> + <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string> + <string name="combo_label">-Select a preset-</string> + + <text + follows="top|left|right" + height="10" + layout="topleft" + left="10" + name="hint" + top="25" + width="685" /> + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="10" + name="label" + top_pad="25" + width="120"> + Preset Name: + </text> + <combo_box + allow_text_entry="true" + follows="top|left" + layout="topleft" + left_pad="10" + max_chars="100" + name="day_cycle_combo" + top_delta="-5" + width="200" /> + <line_editor + height="20" + left_delta="0" + name="day_cycle_name" + top_delta="0" + visible="true" + width="200" /> + <text + follows="top|left|right" + height="95" + layout="topleft" + left_pad="10" + name="note" + top_delta="0" + width="345" + wrap="true"> + Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. + </text> + <!--======== Controls panel ========--> + <text + follows="left|top|right" + height="10" + layout="topleft" + left="10" + name="hint_item1" + top="100" + width="300"> + - Click on a tab to edit the specific sky settings and time. + </text> + <text + follows="left|top|right" + height="10" + layout="topleft" + name="hint_item2" + top_pad="10" + width="300"> + - Click and drag the tabs to set the transition times. + </text> + <text + follows="left|top|right" + height="10" + layout="topleft" + name="hint_item3" + top_pad="10" + width="300"> + - Use the scrubber to preview your day cycle. + </text> + <panel + follows="top|left" + height="100" + name="day_cycle_slider_panel" + layout="topleft" + left_delta="25" + top_pad="15" + width="660"> + <multi_slider + can_edit_text="true" + control_name="WLTimeSlider" + decimal_digits="0" + draw_track="false" + follows="bottom" + height="10" + increment="0.0833333" + initial_value="0" + layout="topleft" + left="20" + max_sliders="20" + max_val="24" + name="WLTimeSlider" + show_text="false" + top_pad="0" + use_triangle="true" + width="525" /> + <multi_slider + can_edit_text="true" + control_name="WLDayCycleKeys" + decimal_digits="0" + follows="bottom" + height="10" + increment="0.0833333" + initial_value="0" + layout="topleft" + left_delta="0" + max_sliders="20" + max_val="24" + name="WLDayCycleKeys" + show_text="false" + top_pad="15" + width="525" /> + <button + height="20" + label="Add Key" + label_selected="Add Key" + layout="topleft" + left_pad="20" + name="WLAddKey" + top_delta="-18" + width="96" /> + <button + height="20" + label="Delete Key" + label_selected="Delete Key" + layout="topleft" + name="WLDeleteKey" + top_pad="5" + width="96" /> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left="8" + name="WL12am" + top="74" + width="55"> + 12am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL3am" + top_delta="0" + width="55"> + 3am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL6am" + top_delta="0" + width="55"> + 6am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL9amHash" + top_delta="0" + width="55"> + 9am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL12pmHash" + top_delta="0" + width="55"> + 12pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL3pm" + top_delta="0" + width="55"> + 3pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL6pm" + top_delta="0" + width="55"> + 6pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL9pm" + top_delta="0" + width="55"> + 9pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL12am2" + top_delta="0" + width="55"> + 12am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left="20" + name="WL12amHash" + top="54" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL3amHash" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL6amHash" + top_delta="-3" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL9amHash2" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL12pmHash2" + top_delta="-3" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL3pmHash" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL6pmHash" + top_delta="-3" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL9pmHash" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL12amHash2" + top_delta="-3" + width="6"> + | + </text> + </panel> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="192" + name="WLCurKeyPresetText" + top_pad="10" + width="80"> + Sky Setting: + </text> + <combo_box + height="18" + label="Preset" + layout="topleft" + left_pad="5" + name="WLSkyPresets" + width="205" /> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-40" + name="WLCurKeyTimeText" + top_pad="15" + width="35"> + Time: + </text> + <time + follows="left|top" + height="16" + label_width="0" + layout="topleft" + left_pad="3" + name="time" + top_delta="-1" + value="6:00 AM" + width="75"/> + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="10" + name="horiz_separator" + top_pad="20" + width="685"/> + <loading_indicator + height="23" + layout="topleft" + left="25" + name="progress_indicator" + top="350" + visible="false" + width="23" /> + <check_box + follows="top|left" + height="10" + label="Make this my new day cycle" + layout="topleft" + left="310" + name="make_default_cb" + top_delta="13" + width="230"/> + <button + follows="bottom|right" + height="23" + label="Save" + layout="topleft" + left_pad="0" + name="save" + top_delta="-13" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="15" + name="cancel" + top_delta="0" + width="70"/> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml new file mode 100644 index 0000000000..56233d91ee --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml @@ -0,0 +1,953 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="375" + layout="topleft" + name="Edit Sky Preset" + help_topic="sky_preset" + save_rect="true" + title="Edit Sky Preset" + width="840"> + + <string name="title_new">Create a New Sky Preset</string> + <string name="title_edit">Edit Sky Preset</string> + <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string> + <string name="hint_edit">To edit your sky preset, adjust the controls and click "Save".</string> + <string name="combo_label">-Select a preset-</string> + + <text + follows="top|left|right" + height="10" + layout="topleft" + left="30" + name="hint" + top="25" + width="700"> + To edit your preset, adjust the controls then click "Save" + </text> + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="30" + name="label" + top_pad="25" + width="120"> + Preset Name: + </text> + <combo_box + allow_text_entry="true" + follows="top|left" + layout="topleft" + left_pad="10" + max_chars="100" + name="sky_preset_combo" + top_delta="-5" + width="200"/> + <line_editor + height="20" + left_delta="0" + name="sky_preset_name" + top_delta="0" + width="200" /> + <text + follows="top|left|right" + height="40" + layout="topleft" + left_pad="10" + name="note" + top_delta="0" + width="405" + wrap="true"> + Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. + </text> + <!--======== Controls panel ========--> + <view_border + bevel_style="none" + follows="top|left" + height="203" + layout="topleft" + left="25" + name="panel_water_preset" + top="122" + visible="true" + width="790"/> + <tab_container + follows="left|top" + height="225" + halign="center" + layout="topleft" + left="22" + name="WindLight Tabs" + tab_position="top" + top="101" + width="794"> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + height="196" + label="ATMOSPHERE" + layout="topleft" + left="1" + help_topic="sky_preset_atmosphere" + mouse_opaque="false" + name="Atmosphere" + top="60" + width="698"> + + <!--======== Tab Panel I. I conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="40" + name="BHText" + top="25" + width="200"> + Blue Horizon + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="WLBlueHorizon" + top_pad="6" + width="60" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + top_pad="20" + name="BDensText" + width="200"> + Haze Horizon + </text> + <slider + control_name="WLHazeHorizon" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.25" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLHazeHorizon" + width="200" /> + + <!--======== Tab Panel I. II conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="BDensText2" + top="25" + width="200"> + Blue Density + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="WLBlueDensity" + top_pad="6" + width="60" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + name="HDText" + top_pad="20" + width="200"> + Haze Density + </text> + <slider + control_name="WLHazeDensity" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="0" + max_val="4" + name="WLHazeDensity" + top_pad="6" + width="200" /> + + <!--======== Tab Panel I. III conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="DensMultText" + top="25" + width="200"> + Density Multiplier + </text> + <slider + control_name="WLDensityMult" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.1" + layout="topleft" + left_delta="15" + max_val="0.9" + name="WLDensityMult" + top_pad="6" + width="200" /> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WLDistanceMultText" + top_pad="20" + width="200"> + Distance Multiplier + </text> + <slider + control_name="WLDistancMult" + decimal_digits="1" + follows="left|top" + height="10" + initial_value="1.0" + layout="topleft" + left_delta="15" + max_val="100" + name="WLDistanceMult" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="MaxAltText" + top_pad="20" + width="200"> + Max Altitude + </text> + <slider + control_name="WLMaxAltitude" + decimal_digits="0" + follows="left|top" + height="10" + increment="1" + initial_value="500" + layout="topleft" + left_delta="15" + max_val="4000" + name="WLMaxAltitude" + top_pad="6" + width="200" /> + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + height="196" + label="LIGHTING" + layout="topleft" + left_delta="0" + help_topic="sky_preset_lighting" + name="Lighting" + top_delta="4" + width="698"> + + <!--======== Tab Panel II. I conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="20" + name="SLCText" + top="25" + width="150"> + Sun/Moon Color + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="10" + name="WLSunlight" + top_pad="6" + width="60" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-10" + name="WLAmbientText" + top_pad="20" + width="150"> + Ambient + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="10" + name="WLAmbient" + top_pad="6" + width="60" /> + + <!--======== Tab Panel II. II conlumn of controls ========--> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="100" + name="SunGlowText" + top="25" + width="200"> + Sun Glow + </text> + <slider + control_name="WLGlowB" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.1" + label="Focus " + layout="topleft" + left_delta="10" + max_val="0.5" + name="WLGlowB" + top_pad="6" + width="200" /> + <slider + control_name="WLGlowR" + decimal_digits="2" + follows="top|left" + height="10" + increment="0.01" + initial_value="0.25" + label="Size " + layout="topleft" + left_delta="0" + max_val="1.99" + min_val="1" + name="WLGlowR" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-10" + name="WLStarText" + top_pad="20" + width="200"> + Star Brightness + </text> + <slider + control_name="WLStarAlpha" + decimal_digits="2" + follows="top|left" + height="10" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="10" + max_val="2" + name="WLStarAlpha" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-10" + name="SceneGammaText" + top_pad="20" + width="200"> + Scene Gamma + </text> + <slider + control_name="WLGamma" + decimal_digits="2" + follows="top|left" + height="10" + increment="0.01" + initial_value="2.0" + layout="topleft" + left_delta="10" + max_val="10" + name="WLGamma" + top_pad="6" + width="200" /> + + <!--======== Tab Panel II. III conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="60" + name="TODText" + top="25" + width="200"> + Sun/Moon Position + </text> + <multi_slider + can_edit_text="true" + control_name="WLSunPos" + decimal_digits="0" + follows="bottom" + height="10" + increment="0.0833333" + initial_value="0" + layout="topleft" + left_delta="0" + max_sliders="1" + max_val="24" + name="WLSunPos" + show_text="false" + top_pad="0" + width="300" /> + + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_delta="2" + name="WL12amHash" + top_pad="6" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="66" + name="WL6amHash" + top_delta="0" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="67" + name="WL12pmHash2" + top_delta="0" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="67" + name="WL6pmHash" + top_delta="0" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="67" + name="WL12amHash2" + top_delta="0" + width="6"> + | + </text> + + + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_delta="-300" + name="WL12am" + top="74" + width="55"> + 12am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="20" + name="WL6am" + top_delta="0" + width="55"> + 6am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="15" + name="WL12pmHash" + top_delta="0" + width="55"> + 12pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="18" + name="WL6pm" + top_delta="0" + width="55"> + 6pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="15" + name="WL12am2" + top_delta="0" + width="55"> + 12am + </text> + + <time + follows="left|top" + height="16" + label_width="0" + layout="topleft" + left_delta="-175" + name="WLDayTime" + top_pad="15" + value="6:00 AM" + width="75"/> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-106" + name="WLEastAngleText" + top_pad="24" + width="200"> + East Angle + </text> + <slider + control_name="WLEastAngle" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.0" + layout="topleft" + left_delta="10" + name="WLEastAngle" + top_pad="6" + width="200" /> + + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + height="196" + label="CLOUDS" + layout="topleft" + left_delta="0" + mouse_opaque="false" + help_topic="sky_preset_clouds" + name="Clouds" + top_delta="4" + width="698"> + + <!--======== Tab Panel III. I conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="40" + name="WLCloudColorText" + top="25" + width="200"> + Cloud Color + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="WLCloudColor" + top_pad="6" + width="60" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + name="WLCloudColorText2" + top_pad="20" + width="200"> + Cloud XY/Density + </text> + <slider + control_name="WLCloudX" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="X" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLCloudX" + width="200" /> + <slider + control_name="WLCloudY" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="Y" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLCloudY" + width="200" /> + <slider + control_name="WLCloudDensity" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + label="D" + layout="topleft" + left_delta="0" + name="WLCloudDensity" + top_pad="6" + width="200" /> + + <!--======== Tab Panel III. II conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="WLCloudCoverageText" + top="15" + width="200"> + Cloud Coverage + </text> + <slider + control_name="WLCloudCoverage" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_delta="15" + name="WLCloudCoverage" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WLCloudScaleText" + top_pad="20" + width="200"> + Cloud Scale + </text> + <slider + control_name="WLCloudScale" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + layout="topleft" + left_delta="15" + min_val="0.01" + name="WLCloudScale" + top_pad="6" + width="200" /> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-13" + name="WLCloudDetailText" + top_pad="20" + width="200"> + Cloud Detail (XY/Density) + </text> + <slider + control_name="WLCloudDetailX" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="X" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLCloudDetailX" + width="200" /> + <slider + control_name="WLCloudDetailY" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="Y" + layout="topleft" + left_delta="0" + name="WLCloudDetailY" + top_pad="6" + width="200" /> + <slider + control_name="WLCloudDetailDensity" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + label="D" + layout="topleft" + left_delta="0" + name="WLCloudDetailDensity" + top_pad="6" + width="200" /> + + <!--======== Tab Panel III. III conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="WLCloudScrollXText" + top="15" + width="150"> + Cloud Scroll X + </text> + <check_box + control_name="WLCloudLockX" + follows="left|top" + height="16" + label="Lock" + layout="topleft" + left_delta="150" + name="WLCloudLockX" + top_delta="0" + width="200" /> + <slider + control_name="WLCloudScrollX" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_delta="-135" + max_val="10" + min_val="-10" + name="WLCloudScrollX" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WLCloudScrollYText" + top_pad="20" + width="150"> + Cloud Scroll Y + </text> + <check_box + control_name="WLCloudLockY" + follows="left|top" + height="16" + label="Lock" + layout="topleft" + left_delta="150" + name="WLCloudLockY" + width="200" /> + <slider + control_name="WLCloudScrollY" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_delta="-135" + max_val="10" + min_val="-10" + name="WLCloudScrollY" + top_pad="6" + width="200" /> + </panel> + </tab_container> +<!--======== End of Controls panel ========--> + + <check_box + follows="top|left" + height="10" + label="Make this preset my new sky setting" + layout="topleft" + left="380" + name="make_default_cb" + top_pad="30" + width="280"/> + <button + follows="bottom|right" + height="23" + label="Save" + layout="topleft" + left_pad="0" + name="save" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="15" + name="cancel" + width="70"/> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml new file mode 100644 index 0000000000..905983e7fa --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml @@ -0,0 +1,448 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="375" + layout="topleft" + name="Edit Water Preset" + help_topic="water_preset" + save_rect="true" + title="Edit Water Preset" + width="725"> + + <string name="title_new">Create a New Water Preset</string> + <string name="title_edit">Edit a Water Preset</string> + <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string> + <string name="hint_edit">To edit your water preset, adjust the controls and click "Save".</string> + <string name="combo_label">-Select a preset-</string> + + <text + follows="top|left|right" + height="10" + layout="topleft" + left="30" + name="hint" + top="25" + width="680"> + To edit your preset, adjust the controls then click "Save" + </text> + + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="30" + name="label" + top_pad="25" + width="120"> + Preset Name: + </text> + + <combo_box + allow_text_entry="true" + follows="top|left" + layout="topleft" + left_pad="10" + max_chars="100" + name="water_preset_combo" + top_delta="-5" + width="200"/> + + <line_editor + height="20" + left_delta="0" + name="water_preset_name" + top_delta="0" + width="200" /> + + <text + follows="top|left|right" + height="40" + layout="topleft" + left_pad="10" + name="note" + top_delta="0" + width="340" + wrap="true"> + Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. + </text> + + <!--======== Controls panel ========--> + <panel + border="false" + bevel_style="none" + follows="top|left" + height="230" + layout="topleft" + left="10" + name="panel_water_preset" + top="100" + width="700"> + +<!--======== I conlumn of controls ========--> + <text + follows="left|top|right" + height="10" + font="SansSerif" + layout="topleft" + left="10" + name="water_color_label" + top="5" + width="215"> + Water Fog Color + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="15" + name="WaterFogColor" + top_pad="8" + width="60" /> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + top_pad="10" + name="water_fog_density_label" + width="215"> + Fog Density Exponent + </text> + <slider + decimal_digits="1" + follows="left|top" + height="10" + initial_value="0" + layout="topleft" + left_delta="15" + max_val="10" + name="WaterFogDensity" + top_pad="10" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + top_pad="15" + name="underwater_fog_modifier_label" + width="215"> + Underwater Fog Modifier + </text> + <slider + decimal_digits="1" + follows="left|top" + height="10" + initial_value="0" + layout="topleft" + left_delta="15" + max_val="10" + name="WaterUnderWaterFogMod" + top_pad="10" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="BHText" + top_pad="15" + width="215"> + Big Wave Direction + </text> + <slider + control_name="WaterWave1DirX" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="X" + layout="topleft" + max_val="4" + min_val="-4" + name="WaterWave1DirX" + top_pad="10" + width="216"/> + <slider + control_name="WaterWave1DirY" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="Y" + layout="topleft" + max_val="4" + min_val="-4" + name="WaterWave1DirY" + top_pad="5" + width="216"/> + +<!--======== II conlumn of controls ========--> + + <text + follows="left|top|right" + font="SansSerif" + height="10" + layout="topleft" + left_pad="20" + name="BDensText" + top="5" + width="215"> + Reflection Wavelet Scale + </text> + <slider + control_name="WaterNormalScaleX" + decimal_digits="1" + follows="left|top" + initial_value="0.7" + layout="topleft" + left_delta="15" + max_val="10" + name="WaterNormalScaleX" + top_pad="10" + width="200"/> + <slider + control_name="WaterNormalScaleY" + decimal_digits="1" + follows="left|top" + initial_value="0.7" + layout="topleft" + max_val="10" + name="WaterNormalScaleY" + top_pad="6" + width="200"/> + <slider + control_name="WaterNormalScaleZ" + decimal_digits="1" + follows="left|top" + initial_value="0.7" + layout="topleft" + max_val="10" + name="WaterNormalScaleZ" + top_pad="6" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="HDText" + top_pad="16" + width="215"> + Fresnel Scale + </text> + <slider + control_name="WaterFresnelScale" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="15" + name="WaterFresnelScale" + top_pad="10" + width="200"/> + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="FresnelOffsetText" + top_pad="15" + width="215"> + Fresnel Offset + </text> + <slider + control_name="WaterFresnelOffset" + decimal_digits="2" + follows="left" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="15" + name="WaterFresnelOffset" + top_pad="10" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="BHText2" + top_pad="15" + width="215"> + Little Wave Direction + </text> + <slider + control_name="WaterWave2DirX" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="X" + layout="topleft" + max_val="4" + min_val="-4" + name="WaterWave2DirX" + top_pad="10" + width="216" /> + <slider + control_name="WaterWave2DirY" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="Y" + layout="topleft" + max_val="4" + min_val="-4" + name="WaterWave2DirY" + top_pad="6" + width="216" /> + +<!--======== III conlumn of contorls ========--> + + <text + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_pad="20" + name="DensMultText" + top="5" + width="215"> + Refract Scale Above + </text> + <slider + control_name="WaterScaleAbove" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.1" + layout="topleft" + left_delta="15" + name="WaterScaleAbove" + top_pad="5" + width="200" /> + + <text + type="string" + length="1" + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WaterScaleBelowText" + top_pad="15" + width="215"> + Refract Scale Below + </text> + <slider + control_name="WaterScaleBelow" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="15" + name="WaterScaleBelow" + top_pad="5" + width="200"/> + + <text + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="MaxAltText" + top_pad="15" + width="215"> + Blur Multiplier + </text> + <slider + control_name="WaterBlurMult" + follows="left|top" + height="10" + increment="0.001" + initial_value="0" + layout="topleft" + left_delta="15" + max_val="0.16" + name="WaterBlurMult" + top_pad="5" + width="200"/> + + <text + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="BHText3" + top_pad="15" + width="215"> + Normal Map + </text> + <texture_picker + height="80" + layout="topleft" + left_delta="15" + name="WaterNormalMap" + top_pad="5" + width="100" /> + </panel> +<!--======== End of Controls panel ========--> + + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="10" + name="horiz_separator" + top_pad="5" + width="700"/> + <check_box + follows="top|left" + height="10" + label="Make this preset my new water setting" + layout="topleft" + left="275" + name="make_default_cb" + top_pad="20" + width="280"/> + <button + follows="bottom|right" + height="23" + label="Save" + layout="topleft" + left_pad="0" + name="save" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="15" + name="cancel" + width="70"/> + + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml deleted file mode 100644 index 8df5e232d9..0000000000 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ /dev/null @@ -1,164 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="150" - layout="topleft" - name="Environment Editor Floater" - help_topic="environment_editor_floater" - save_rect="true" - title="ENVIRONMENT EDITOR" - width="600"> - <floater.string - name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="EnvTimeText" - top="32" - width="140"> - Time of Day - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="16" - layout="topleft" - left="15" - name="EnvTimeText2" - top="62" - width="140"> - 12:00 PM - </text> - <icon - height="25" - image_name="icon_diurnal.tga" - layout="topleft" - left="85" - name="EnvDayCycle" - top="30" - use_draw_context_alpha="false" - width="200" /> - <slider - control_name="EnvTimeSlider" - decimal_digits="2" - follows="left" - height="10" - increment="0.0069444" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="0.99" - name="EnvTimeSlider" - show_text="false" - top_pad="10" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="EnvCloudText" - top="86" - width="140"> - Cloud Cover - </text> - <slider - control_name="EnvCloudSlider" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="75" - name="EnvCloudSlider" - top_delta="4" - width="210" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="310" - name="EnvWaterColorText" - top="39" - width="140"> - Water Color - </text> - <color_swatch - can_apply_immediately="true" - color="0.5 0.5 0.5 1" - follows="left|top" - height="50" - layout="topleft" - left="390" - name="EnvWaterColor" - tool_tip="Click to open color picker" - top="30" - width="40" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="310" - name="EnvWaterFogText" - top="86" - width="140"> - Water Fog - </text> - <slider - control_name="EnvWaterFogSlider" - decimal_digits="2" - follows="left" - height="10" - initial_value="0" - layout="topleft" - left_delta="75" - max_val="10" - name="EnvWaterFogSlider" - top_delta="4" - width="210" /> - <button - follows="left|top" - height="23" - label="Use Estate Time" - layout="topleft" - left="10" - name="EnvUseEstateTimeButton" - top="120" - width="137" /> - <button - follows="left|top" - height="23" - label="Advanced Sky" - layout="topleft" - left_pad="3" - name="EnvAdvancedSkyButton" - top_delta="0" - width="137" /> - <button - follows="left|top" - height="23" - label="Advanced Water" - layout="topleft" - left_pad="3" - name="EnvAdvancedWaterButton" - top_delta="0" - width="137" /> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml new file mode 100644 index 0000000000..1b1cafaca6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="328" + layout="topleft" + name="Environment Editor Floater" + help_topic="environment_editor_floater" + save_rect="true" + title="ENVIRONMENT SETTINGS" + width="540"> + + <text + follows="top|left|right" + height="15" + layout="topleft" + left="20" + name="note" + top="25" + width="510" + wrap="true"> + Use the options below to customize the environment settings for your viewer. + </text> + + <view_border + bevel_style="none" + follows="top|left" + height="237" + layout="topleft" + left="20" + name="border" + top_pad="8" + width="500"/> + <radio_group + follows="top|left" + height="45" + layout="topleft" + left_delta="10" + name="region_settings_radio_group" + top_delta="20" + width="200"> + <radio_item + label="Use region settings" + layout="topleft" + name="use_region_settings"/> + <radio_item + label="Customize my environment" + layout="topleft" + name="use_my_settings" + top_pad="20"/> + </radio_group> + + <panel + height="170" + layout="topleft" + left="50" + name="user_environment_settings" + top_pad="0" + width="470"> + + <text + follows="top|left|right" + font="SansSerifItalic" + height="15" + layout="topleft" + left_delta="0" + name="note" + top_pad="0" + width="470" + wrap="true"> + Note: your custom settings will not be visible to other users. + </text> + + <!-- Water Setting --> + <text + name="water_settings_title" + follows="top|left" + height="16" + layout="topleft" + left="50" + top="40" + width="200"> + Water Setting + </text> + <combo_box + follows="top|left" + left_pad="2" + name="water_settings_preset_combo" + top_delta="-5" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + + + <!-- Sky/Day Cycle Settings --> + <text + name="sky_dayc_settings_title" + follows="top|left" + height="16" + layout="topleft" + left="50" + top_pad="20" + width="100"> + Sky / Day Cycle + </text> + <radio_group + layout="topleft" + left_delta="50" + name="sky_dayc_settings_radio_group" + top_pad="10" + height="50" + width="150"> + <radio_item + layout="topleft" + label="Fixed sky" + name="my_sky_settings"/> + <radio_item + layout="topleft" + label="Day cycle" + name="my_dayc_settings" + top_pad="25"/> + </radio_group> + <combo_box + follows="top|left" + left_pad="2" + name="sky_settings_preset_combo" + top_delta="-7" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + <combo_box + follows="top|left" + name="dayc_settings_preset_combo" + top_delta="36" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + </panel> + + <button + follows="left|top" + height="23" + label="OK" + layout="topleft" + right="-130" + name="ok_btn" + top_pad="10" + width="100" /> + <button + follows="left|top" + height="23" + label="Cancel" + layout="topleft" + left_pad="10" + name="cancel_btn" + width="100" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index a97c697b24..05f4c52b95 100644 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -80,7 +80,7 @@ left_pad="10" name="antialiasing restart" top_delta="0" - width="188"> + width="230"> (requires viewer restart) </text> <spinner diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index 02e50ee584..de6d586f72 100644 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -2,6 +2,8 @@ <floater legacy_header_height="18" can_resize="true" + left="10000" + bottom="10000" height="600" layout="topleft" min_height="150" diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index 43729d7c9f..5a1f920398 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -5,7 +5,7 @@ height="440" layout="topleft" min_height="140" - min_width="467" + min_width="0" name="floater_about" help_topic="floater_about" save_rect="true" diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 374eeeb0de..1d4a1d4827 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true" height="550" min_height="550" min_width="620" - name="Model Preview" title="Upload Model" width="620"> + name="Model Preview" title="Upload Model" width="620" + help_topic="upload_model" > <string name="status_idle">Idle</string> + <string name="status_parse_error">Dae parsing issue - see log for details.</string> <string name="status_reading_file">Loading...</string> <string name="status_generating_meshes">Generating Meshes...</string> <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string> + <string name="bad_element">Error: element is invalid</string> <string name="high">High</string> <string name="medium">Medium</string> <string name="low">Low</string> @@ -21,12 +24,13 @@ <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" --> <string name="decomposing">Analyzing...</string> <string name="simplifying">Simplifying...</string> + <string name="tbd">TBD</string> <text left="15" bottom="25" follows="top|left" height="15" name="name_label"> Name: </text> - <line_editor bottom_delta="20" follows="top|left|right" height="19" + <line_editor bottom_delta="20" follows="top|left|right" height="19" max_length_bytes="64" name="description_form" prevalidate_callback="ascii" width="290" /> <text bottom_delta="20" left="15" follows="left|top" height="15" name="lod_label"> @@ -68,29 +72,89 @@ width="290" height="290" follows="all"/> - - <text bottom_delta="25" left="25" width="100" follows="bottom|left">Upload Details</text> - <panel top_pad="5" border="true" left="15" width="290" height="70" follows="bottom|left" - bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3"> - <text left="25" follows="bottom|left" width="140" height="15" name="streaming cost"> - Resource Cost: [COST] - </text> - <text left="25" top_pad="5" width="140" follows="bottom|left" height="15" name="physics cost"> - Physics Cost: [COST] + + <text + font="SansSerif" + bottom_delta="15" + left_delta="0" + name="warning_title" + text_color="Yellow" + visible="false"> + WARNING: </text> - <text left="25" top_pad="5" follows="bottom|left" height="15" name="upload fee"> - Upload Fee: N/A - </text> - </panel> + <text + text_color="White" + height="40" + width="290" + top_delta="15" + left_delta="0" + name="warning_message" + parse_urls="true" + wrap="true" + visible="false"> + You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text> + + <text + height="65" + top_delta="45" + left_delta="0" + name="weights_text" + width="80" + word_wrap="true" + > +Download: +Physics: +Server: + +Prim equivs: + </text> - <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text> + <text + height="65" + top_delta="0" + left_delta="80" + name="weights" + width="70" + word_wrap="true" + > +[ST] +[PH] +[SIM] + +[EQ] + </text> - - <button bottom="540" left="300" follows="bottom|right" height="20" label="Defaults" - width="80" name="reset_btn" tool_tip="Reset to defaults"/> - <button bottom="540" left="430" follows="bottom|right" height="20" label="Upload" - width="80" name="ok_btn" tool_tip="Upload to simulator"/> - <button left_pad="10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/> +<!-- + <text + height="65" + top_delta="0" + left_delta="70" + name="price_breakdown_text" + width="80" + word_wrap="true" + > +Streaming: +Physics: +Instances: +Textures: +Model: + </text> + + <text + height="65" + top_delta="0" + left_delta="80" + name="price_breakdown" + width="65" + word_wrap="true" + > +L$ [STREAMING] +L$ [PHYSICS] +L$ [INSTANCES] +L$ [TEXTURES] +L$ [MODEL] + </text> + --> <tab_container follows="right|top|bottom" @@ -106,7 +170,8 @@ <panel border="true" label="Level of Detail" - name="lod_panel"> + name="lod_panel" + help_topic="upload_model_lod"> <text left="10" width="240" bottom="20" height="15" follows="left|top" name="lod_table_header"> Select Level of Detail: @@ -229,7 +294,8 @@ <panel border="true" label="Physics" - name="physics_panel"> + name="physics_panel" + help_topic="upload_model_physics"> <!-- PHYSICS GEOMETRY--> <panel @@ -370,7 +436,9 @@ <panel border="true" label="Modifiers" - name="modifiers_panel"> + name="modifiers_panel" + help_topic="upload_model_modifiers"> + <text left="10" width="90" bottom="30" follows="top|left" height="15"> Scale: </text> @@ -400,6 +468,26 @@ </panel> </tab_container> + + <text + height="16" + left_delta="5" + bottom_delta="30" + name="upload_fee" + width="300" + follows="bottom|right" + word_wrap="true" + > + Upload fee: L$ [FEE] + </text> + + <button bottom="540" left="10" follows="bottom|left" height="20" label="Set to defaults" + width="100" name="reset_btn" tool_tip="Set to defaults"/> + <button left="310" follows="bottom|right" height="20" label="Calculate weights & fee" + width="150" name="calculate_btn" tool_tip="Calculate weights & fee" top_delta="0"/> + <button bottom="540" left="310" follows="bottom|right" height="20" label="Upload" + width="80" name="ok_btn" tool_tip="Upload to simulator" visible="false"/> + <button right="-10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn" top_delta="0"/> <!-- <button bottom_delta="0" left="10" width="120" name="auto fill" label="Generate LOD" tool_tip="Automatically generate levels of detail"/> diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml index 92d57b20be..b5a5ff5342 100644 --- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml @@ -49,24 +49,6 @@ top="32" left="210" height="32" - name="physics2_btn" - label="3. Physics" - tab_stop="false" - enabled="false" - border="false" - image_unselected="BreadCrumbBtn_Middle_Off" - image_selected="BreadCrumbBtn_Middle_Press" - image_hover_unselected="BreadCrumbBtn_Middle_Over" - image_disabled="BreadCrumbBtn_Middle_Disabled" - image_disabled_selected="BreadCrumbBtn_Middle_Disabled" - width="110"> - <button.commit_callback - function="Wizard.Physics2"/> - </button> - <button - top="32" - left="210" - height="32" name="physics_btn" label="3. Physics" tab_stop="false" @@ -140,41 +122,50 @@ height="10" font="SansSerifBig" layout="topleft"> - Upload Model + Choose model file </text> </panel> - <text - top_pad="14" - width="460" - height="20" - name="description" - font="SansSerifSmall" - layout="topleft" - word_wrap="true" - left_delta="5"> - This wizard will help you import mesh models to Second Life. First specify a file containing the model you wish to import. Second Life supports COLLADA (.dae) files. - </text> <panel - top_delta="40" + top_pad="14" left="15" - height="270" + height="310" width="505" name="content" bg_opaque_color="DkGray2" background_visible="true" background_opaque="true"> + <text + height="32" + left="10" + name="advanced_users_text" + text_color="White" + top="15" + width="320" + word_wrap="true"> + Advanced users: If you are familiar with 3D content creation tools you may wish to use the Advanced Uploader. + </text> + <button + follows="left|top" + height="20" + label="Switch to Advanced" + layout="topleft" + left_delta="0" + name="switch_to_advanced" + top_pad="5" + width="130"> + </button> <text type="string" length="1" text_color="White" follows="left|top" - top="10" + top_pad="30" height="10" layout="topleft" - left_delta="10" + left_delta="0" name="Cache location" - width="300"> - Filename: + width="320"> + Choose model file to upload </text> <line_editor border_style="line" @@ -187,7 +178,7 @@ max_length="4096" name="lod_file" top_pad="5" - width="220" /> + width="230" /> <button follows="left|top" height="23" @@ -200,23 +191,27 @@ width="85"> </button> <text - top_delta="-15" - width="200" - height="15" - font="SansSerifSmall" + type="string" + length="1" + text_color="White" + follows="left|top" + top_pad="5" + height="10" layout="topleft" - text_color="White" - left_pad="19"> - Model Preview: + left="10" + name="Cache location" + width="320"> + Second Life supports COLLADA (.dae) files </text> <!-- Placeholder panel for 3D preview render --> <panel - left_delta="0" - top_pad="0" - name="preview_panel" + top="30" + right="-10" + name="choose_file_preview_panel" bevel_style="none" highlight_light_color="0.09 0.09 0.09 1" border="true" + border_style="line" height="150" follows="all" width="150"> @@ -225,7 +220,7 @@ top_pad="10" width="130" height="14" - left="340" + left_delta="0" text_color="White" word_wrap="true"> Dimensions (meters): @@ -238,15 +233,7 @@ text_color="White" name="dimensions" left_delta="0"> - X: Y: Z: - </text> - <text - top_delta="0" - width="160" - height="15" - name="dimension_dividers" - left_delta="41"> - | | + X Y Z </text> <text top_delta="0" @@ -266,23 +253,26 @@ height="15" name="dimension_z" left="450"/> - <text - top="100" - width="320" - height="15" - left="10" - text_color="White" - word_wrap="true"> - Note: - </text> - <text - top_pad="0" - width="320" - height="40" - left="10" - word_wrap="true"> -Advanced users familiar with 3d content creation tools may prefer to use the [secondlife:///app/floater/upload_model Advanced Mesh Import Window] . - </text> + <text + height="16" + left="10" + name="warning_label" + text_color="Yellow" + top="200" + visible="false" + width="320"> + WARNING: + </text> + <text + height="50" + left="10" + name="warning_text" + top_pad="0" + visible="false" + width="320" + word_wrap="true"> + You will not be able to complete the final step of uploading this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to set up your account for mesh model uploads. + </text> </panel> </panel> @@ -291,7 +281,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se height="388" top_delta="0" name="optimize_panel" - visible="false" + visible="true" width="535" left="0"> <panel @@ -312,7 +302,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se height="10" font="SansSerifBig" layout="topleft"> - Optimize + Optimize model </text> </panel> <text @@ -324,7 +314,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se name="description" word_wrap="true" left_delta="5"> - This wizard has optimized your model to improve performance. You may adjust the results of the optimization process bellow or click Next to continue. + We have optimized the model for performance. Adjust it further if you wish. </text> <panel top_delta="40" @@ -411,116 +401,89 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se bg_opaque_color="DkGray2" background_visible="true" background_opaque="true"> - <text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label"> - Model Preview: - </text> - <combo_box left_pad="5" top_delta="-5" follows="left|top" list_position="below" height="22" - name="preview_lod_combo2" width="90" tool_tip="LOD to view in preview render"> - <combo_item name="high"> - High - </combo_item> - <combo_item name="medium"> - Medium - </combo_item> - <combo_item name="low"> - Low - </combo_item> - <combo_item name="lowest"> - Lowest - </combo_item> - </combo_box> - <panel - left="10" - top_pad="5" - name="preview_panel" - bevel_style="none" - highlight_light_color="0.09 0.09 0.09 1" - border_style="line" - border="true" - height="185" - follows="all" - width="185"> - </panel> - <text top="45" left="214" text_color="White" font="SansSerifSmallBold" halign="center" width="110" height="30" wrap="true">Higher Performance</text> - <text top="75" left="204" halign="center" width="130" word_wrap="true" font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text> - <text top="45" left="378" text_color="White" font="SansSerifSmallBold" halign="center" width="90" height="30" wrap="true">Higher Accuracy</text> - <text top="75" left="364" halign="center" width="130" word_wrap="true" font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text> + <text top="69" left="10" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Performance</text> + <text top="85" left="10" width="120" word_wrap="true" font="SansSerifSmall" height="40">Faster rendering +Less detail +Lower prim weight</text> + <text top="69" left="184" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Accuracy</text> + <text top="85" left="184" width="120" word_wrap="true" font="SansSerifSmall" height="40">Slower rendering +More detail +Higher prim weight</text> - <slider + <slider follows="left|top" height="20" increment="1" layout="topleft" - left="204" - max_val="3" - initial_value="2" + left="10" + max_val="2" + initial_value="1" min_val="0" name="accuracy_slider" show_text="false" top="130" width="290" /> - <text + <text font="SansSerifSmall" top_pad="0" - width="300" + width="5" left_delta="6" height="4">' - </text> - - - <icon - top_pad="14" - left_delta="0" - width="280" - height="2" - image_name="model_wizard\divider_line.png"/> - - <text top_delta="20" width="200" text_color="White" left_delta="50" name="streaming cost" height="20">Resource Cost: [COST]</text> - <text - top_pad="15" - width="130" - height="14" - left="10" - text_color="White" - word_wrap="true"> - Dimensions (meters): - </text> - <text - top_pad="0" - width="160" - height="15" - font="SansSerifSmallBold" - text_color="White" - name="dimensions" - left_delta="0"> - X: Y: Z: - </text> - <text - top_delta="0" - width="160" - height="15" - name="dimension_dividers" - left_delta="41"> - | | + </text> + <text + font="SansSerifSmall" + top_delta="0" + width="5" + left_delta="137" + height="4">' + </text> + <text + font="SansSerifSmall" + top_delta="0" + width="5" + left_delta="137" + height="4">' + </text> + <button + follows="left|top" + height="20" + label="Recalculate Geometry" + layout="topleft" + left="80" + name="recalculate_geometry_btn" + top_pad="15" + width="150"> + </button> + <text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label"> + Geometry preview </text> - <text - top_delta="0" - width="160" - height="15" - name="dimension_x" - left_delta="-25"/> - <text - top_delta="0" - width="160" - height="15" - name="dimension_y" - left_delta="46"/> - <text - top_delta="0" - width="160" - height="15" - name="dimension_z" - left_delta="46"/> + <panel + right="-10" + top="32" + name="optimize_preview_panel" + bevel_style="none" + highlight_light_color="0.09 0.09 0.09 1" + border_style="line" + border="true" + height="185" + follows="all" + width="185"> + </panel> + <combo_box left_delta="75" top_pad="10" follows="left|top" list_position="below" height="22" + name="preview_lod_combo" width="110" tool_tip="LOD to view in preview render"> + <combo_item name="high"> + High detail + </combo_item> + <combo_item name="medium"> + Medium detail + </combo_item> + <combo_item name="low"> + Low detail + </combo_item> + <combo_item name="lowest"> + Lowest detail + </combo_item> + </combo_box> </panel> </panel> @@ -549,7 +512,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se font="SansSerifBig" text_color="White" layout="topleft"> - Physics + Adjust physics </text> </panel> <text @@ -561,7 +524,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se name="description" word_wrap="true" left_delta="5"> - The wizard will create a physical shape, which determines how the object interacts with other objects and avatars. Set the slider to the detail level most appropriate for how your object will be used: + We will create a shape for the outer hull of the model. Adjust the shape's detail level as needed for the intended purpose of your model. </text> <panel top_delta="44" @@ -572,172 +535,94 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se bg_opaque_color="DkGray2" background_visible="true" background_opaque="true"> - <text top="25" left="30" text_color="White" font="SansSerifSmallBold" width="300" height="4">Performance</text> - <text top="45" left="10" halign="center" width="130" word_wrap="true" font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text> - <text top="25" left="390" text_color="White" font="SansSerifSmallBold" width="300" height="4">Accuracy</text> - <text top="45" left="360" halign="center" width="130" word_wrap="true" font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text> + <text top="10" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Performance</text> + <text top="26" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Faster rendering +Less detail +Lower prim weight</text> + <text top="174" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Accuracy</text> + <text top="190" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Slower rendering +More detail +Higher prim weight</text> <slider follows="left|top" - height="22" + height="190" increment=".1" layout="topleft" - left="20" + left="140" max_val="1" initial_value="0.5" min_val="0" name="physics_slider" + orientation="vertical" show_text="false" - top="90" - width="440" /> - <text - font="SansSerifSmall" - top_pad="0" - width="500" - left_delta="6" - height="4">' ' ' ' ' ' ' ' ' ' '</text> - <text top_pad="10" width="110" halign="center" word_wrap="true" left="25" height="40">Recommended for solid objects</text> - <text top_delta="0" width="110" halign="center" word_wrap="true" left="190" height="40">Recommended for buildings</text> - <text top_delta="0" width="110" halign="center" word_wrap="true" left="350" height="40">Recommended for vehicles</text> - - - <icon - top_pad="5" - left="15" - width="470" - height="2" - image_name="model_wizard\divider_line.png"/> - - <text top_delta="30" width="180" text_color="White" left="160" name="streaming cost" height="20">Resource Cost: [COST]</text> - - </panel> - </panel> - - <panel - height="388" - top_delta="0" - name="physics2_panel" - visible="true" - width="535" - left="0"> - <panel - height="22" - top_pad="15" - name="header_panel" - width="505" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true" - left="15"> - <text - width="200" - left="10" - name="header_text" - text_color="White" - top="3" - height="10" - font="SansSerifBig" - layout="topleft"> - Physics - </text> - </panel> - <text - top_pad="14" - width="475" - height="50" - font="SansSerifSmall" - layout="topleft" - name="description" - word_wrap="true" - left_delta="5"> - Preview the physics shape below then click Next to continue. To modify the physics shape, click the Back button. - </text> - <panel - top_delta="40" - left="15" - height="270" - width="505" - name="content" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true"> - <text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label"> - Model Preview: + top="25" + width="22" /> + <text top="10" width="120" word_wrap="true" left_pad="10" height="50">Examples: +Moving objects +Flying objects +Vehicles</text> + <text top="95" width="120" word_wrap="true" left_delta="0" height="50">Examples: +Small static objects +Less detailed objects +Simple furniture</text> + <text top="180" width="120" word_wrap="true" left_delta="0" height="50">Examples: +Static objects +Detailed objects +Buildings</text> + <button + follows="left|top" + height="20" + label="Recalculate physics" + layout="topleft" + left="80" + name="recalculate_physics_btn" + top_pad="10" + width="150"> + </button> + <button + enabled="false" + follows="left|top" + height="20" + label="Recalculating..." + layout="topleft" + left_delta="0" + name="recalculating_physics_btn" + top_delta="0" + visible="false" + width="150"> + </button> + <text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label"> + Physics preview </text> - <combo_box left_pad="5" top_delta="-5" follows="left|top" list_position="below" height="22" - name="preview_lod_combo3" width="90" tool_tip="LOD to view in preview render"> + <panel + right="-10" + top="32" + name="physics_preview_panel" + bevel_style="none" + highlight_light_color="0.09 0.09 0.09 1" + border_style="line" + border="true" + height="185" + follows="all" + width="185"> + </panel> + <combo_box left_delta="75" top_pad="10" follows="left|top" list_position="below" height="22" + name="preview_lod_combo2" width="110" tool_tip="LOD to view in preview render"> <combo_item name="high"> - High + High detail </combo_item> <combo_item name="medium"> - Medium + Medium detail </combo_item> <combo_item name="low"> - Low + Low detail </combo_item> <combo_item name="lowest"> - Lowest + Lowest detail </combo_item> </combo_box> - <panel - left="10" - top_pad="10" - name="preview_panel" - bevel_style="none" - highlight_light_color="0.09 0.09 0.09 1" - border_style="line" - border="true" - height="190" - follows="all" - width="190"> - </panel> - <text - top_pad="8" - width="130" - height="14" - left="10" - text_color="White" - word_wrap="true"> - Dimensions (meters): - </text> - <text - top_pad="0" - width="160" - height="15" - font="SansSerifSmallBold" - text_color="White" - name="dimensions" - left_delta="0"> - X: Y: Z: - </text> - <text - top_delta="0" - width="160" - height="15" - name="dimension_dividers" - left_delta="41"> - | | - </text> - <text - top_delta="0" - width="160" - height="15" - name="dimension_x" - left_delta="-25"/> - <text - top_delta="0" - width="160" - height="15" - name="dimension_y" - left_delta="46"/> - <text - top_delta="0" - width="160" - height="15" - name="dimension_z" - left_delta="46"/> - <text top="60" width="180" text_color="White" left="225" name="streaming cost" height="20">Resource Cost: [COST]</text> - </panel> + </panel> </panel> <panel @@ -768,162 +653,44 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se Review </text> </panel> - <text + <panel top_pad="14" - width="470" - height="24" - font="SansSerifSmall" - layout="topleft" - name="description" - word_wrap="true" - left_delta="5"> - Review the details below then click. Upload to upload your model. Your L$ balance will be charged when you click Upload. - </text> - <icon - top_pad="10" - left="20" - width="495" - height="2" - image_name="model_wizard\divider_line.png"/> - <panel - top_pad="5" left="15" - height="270" + height="310" width="505" - name="content"> - <text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label"> - Model Preview: - </text> - <combo_box left_pad="5" top_delta="-5" follows="left|top" list_position="below" height="22" - name="preview_lod_combo" width="90" tool_tip="LOD to view in preview render"> - <combo_item name="high"> - High - </combo_item> - <combo_item name="medium"> - Medium - </combo_item> - <combo_item name="low"> - Low - </combo_item> - <combo_item name="lowest"> - Lowest - </combo_item> - </combo_box> - <panel - left="10" - top_pad="10" - name="preview_panel" - bevel_style="none" - highlight_light_color="0.09 0.09 0.09 1" - border_style="line" - border="true" - height="190" - follows="all" - width="190"> - </panel> - <text - top_pad="8" - width="130" - height="14" - left="10" - text_color="White" - word_wrap="true"> - Dimensions (meters): - </text> - <text - top_pad="0" - width="160" - height="15" - font="SansSerifSmallBold" - text_color="White" - name="dimensions" - left_delta="0"> - X: Y: Z: - </text> - <text - top_delta="0" - width="160" - height="15" - name="dimension_dividers" - left_delta="41"> - | | - </text> - <text - top_delta="0" - width="160" - height="15" - name="dimension_x" - left_delta="-25"/> - <text - top_delta="0" - width="160" - height="15" - name="dimension_y" - left_delta="46"/> - <text - top_delta="0" - width="160" - height="15" - name="dimension_z" - left_delta="46"/> + name="content" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true"> + <text + top="20" + width="485" + font="SansSerifMedium" + text_color="White" + left="10" + name="review_prim_equiv" + height="16">Impact to parcel/region: [EQUIV] prim equivalents + </text> + <text + top_pad="20" + width="485" + font="SansSerifMedium" + text_color="White" + left="10" + name="review_fee" + height="16">Your account will be charged an upload fee of L$ [FEE]. + </text> + <text + top_pad="20" + width="485" + font="SansSerifMedium" + text_color="White" + left="10" + name="review_confirmation" + height="32" + word_wrap="true">By clicking the upload button, you confirm that you have the appropriate rights to the material contained in the model. + </text> </panel> - <text - width="300" - height="12" - top="125" - name="streaming cost" - left="230" - font="SansSerifSmallBold" - text_color="White">Resource Cost: [COST]</text> - <text - width="285" - height="30" - top_pad="0" - left_delta="0" - word_wrap="true" - font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text> - <text - width="300" - height="12" - name="physics cost" - top_pad="10" - left_delta="0" - font="SansSerifSmallBold" - text_color="White">Physics Cost: [COST]</text> - <text - width="285" - height="30" - top_pad="0" - left_delta="0" - word_wrap="true" - font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text> - <text - width="200" - height="12" - top_pad="10" - left_delta="0" - font="SansSerifSmallBold" - text_color="White">Upload Fee:</text> - <text - width="285" - height="26" - top_pad="0" - left_delta="0" - word_wrap="true" - font="SansSerifItalic">This is the amount the upload will cost.</text> - <check_box - height="16" - layout="topleft" - left_delta="0" - name="confirm_checkbox" - top_pad="15" - width="16" /> - <text - height="100" - width="240" - word_wrap="true" - left_delta="25" - top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text> </panel> @@ -954,46 +721,79 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se height="10" font="SansSerifBig" layout="topleft"> - Upload Complete! + Upload complete </text> </panel> <text top_pad="14" - width="474" - height="20" - font="SansSerifSmall" + width="495" + height="16" + font="SansSerifMedium" layout="topleft" - name="description" + name="model_uploaded_text" + text_color="White" word_wrap="true" - left_delta="5"> - Congratulations! Your model has been sucessfully uploaded. You will find the model in the Objects folder in your inventory. + left="25"> + Your model has been uploaded. + </text> + <text + top_pad="5" + width="495" + height="16" + font="SansSerifMedium" + layout="topleft" + name="inventory_text" + text_color="White" + word_wrap="true" + left="25"> + You will find it in the Objects folder in your inventory. + </text> + <text + top_pad="20" + width="495" + font="SansSerifMedium" + text_color="White" + left="25" + name="charged_fee" + height="16">Your account has been charged L$ [FEE]. </text> - <icon - top_pad="15" - left_delta="0" - width="495" - height="2" - image_name="model_wizard\divider_line.png"/> </panel> <button top="440" - right="-245" + right="-285" width="90" height="22" name="back" label="<< Back" /> <button top_delta="0" - right="-150" + right="-190" width="90" height="22" name="next" label="Next >> " /> <button top_delta="0" + left_delta="0" + width="160" + height="22" + name="calculate" + label="Calculate weights & fee >> " /> + <button + enabled="false" + visible="false" + top_delta="0" + left_delta="0" + width="160" + height="22" + name="calculating" + label="Calculating... " /> + <button + enabled="false" + top_delta="0" right="-150" width="90" height="22" @@ -1019,9 +819,11 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se <spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/> <string name="status_idle">Idle</string> + <string name="status_parse_error">Dae parsing issue - see log for details.</string> <string name="status_reading_file">Loading...</string> <string name="status_generating_meshes">Generating Meshes...</string> - <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string> + <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string> + <string name="bad_element">Error: element is invalid</string> <string name="high">High</string> <string name="medium">Medium</string> <string name="low">Low</string> 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 9f6199fada..478ae5f53f 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -50,17 +50,17 @@ name="desc_label" top_pad="25" font.style="BOLD" - width="100"> + width="105"> Description: </text> <line_editor follows="left|top" height="20" layout="topleft" - left_delta="89" + left_delta="94" name="desc" top_delta="-4" - width="175" /> + width="170" /> <text type="string" length="1" @@ -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="215"> Replace with: </text> <line_editor follows="left|top" height="20" layout="topleft" - left_delta="99" + left_delta="104" max_length_bytes="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="160" /> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index 32fb6f97e7..3b58cd08f6 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -16,5 +16,5 @@ name="region_panels" right="-1" tab_position="top" - top="20" /> + top="20"/> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index 619669d28a..52de9ddd47 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -41,14 +41,14 @@ follows="top|left" left="16" name="info_parcel_label" - width="48"> + width="70"> Parcel: </text> <text top_delta="0" follows="top|left" height="16" - left="56" + left="78" name="info_parcel" right="-20"> PARCEL NAME @@ -57,14 +57,14 @@ follows="top|left" left="16" name="info_size_label" - width="48"> + width="70"> Size: </text> <text follows="top|left" top_delta="0" height="32" - left="56" + left="78" name="info_size" right="-20"> [AREA] m² @@ -164,20 +164,21 @@ left_delta="0" name="sell_to_agent" top_pad="4" - width="170" /> + width="150" /> <button height="20" label="Select" left_pad="5" name="sell_to_select_agent" top_delta="0" - width="60" /> + width="90" /> <text follows="top|left" font="SansSerif" height="16" left="30" - name="sell_objects_label"> + name="sell_objects_label" + width="266"> 3. Sell the objects with the land? </text> <text @@ -199,20 +200,20 @@ <radio_item bottom="40" height="0" - left="10" + left="2" name="none" visible="false" /> <radio_item top_pad="10" - height="16" + height="18" label="No, keep ownership of objects" - left="10" + left="2" name="no" /> <radio_item top_pad="10" height="16" label="Yes, sell objects with land" - left="10" + left="2" name="yes" /> </radio_group> <button @@ -221,7 +222,7 @@ name="show_objects" left="70" top_pad="10" - width="110" /> + width="140" /> <text bottom_delta="30" follows="top|left" @@ -229,7 +230,7 @@ height="16" left="16" name="nag_message_label" - right="-20"> + right="-5"> REMEMBER: All sales are final. </text> <button @@ -239,15 +240,15 @@ left_delta="0" name="sell_btn" top_pad="10" - width="130" /> + width="185" /> <button follows="bottom|left" height="20" label="Cancel" - left_pad="30" + left_pad="5" name="cancel_btn" top_delta="0" - width="90" /> + width="85" /> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index e413228ddc..89a0c4c287 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -100,7 +100,7 @@ right="-5" name="upload_btn" top_delta="0" - width="100" /> + width="110" /> <flyout_button follows="left|top" height="23" @@ -147,7 +147,7 @@ right="-5" left_pad="5" name="discard_btn" - width="100" /> + width="110" /> <text type="string" length="1" @@ -330,13 +330,13 @@ increment="1" initial_value="75" label="Image quality" - label_width="100" + label_width="124" layout="topleft" left_delta="0" max_val="100" name="image_quality_slider" top_pad="5" - width="205" /> + width="228" /> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index b99a8b6228..8901583799 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -47,24 +47,12 @@ Click and drag to select land </floater.string> <floater.string - name="grid_screen_text"> - Screen + name="status_selectcount"> + [OBJ_COUNT] objects ( [PRIM_COUNT] prims[PE_STRING] ) selected </floater.string> <floater.string - name="grid_local_text"> - Local - </floater.string> - <floater.string - name="grid_world_text"> - World - </floater.string> - <floater.string - name="grid_reference_text"> - Reference - </floater.string> - <floater.string - name="grid_attachment_text"> - Attachment + name="status_selectprimequiv"> + , [SEL_WEIGHT] prim equivs </floater.string> <button follows="left|top" @@ -221,7 +209,7 @@ <radio_group follows="left|top" left="5" - top="59" + top="55" height="70" layout="topleft" name="edit_radio_group"> @@ -255,18 +243,18 @@ label="Edit linked" layout="topleft" name="checkbox edit linked parts" - top_pad="-10"> + top_pad="-18"> <check_box.commit_callback function="BuildTool.selectComponent"/> </check_box> <button follows="left|top" - height="23" + height="20" label="Link" - top_pad="2" + top="108" layout="topleft" - left="5" + left="143" name="link_btn" width="50"> <button.commit_callback @@ -274,27 +262,15 @@ </button> <button follows="left|top" - height="23" + height="20" label="Unlink" layout="topleft" left_pad="2" name="unlink_btn" - width="50"> + width="90"> <button.commit_callback function="BuildTool.UnlinkObjects"/> </button> - <text - text_color="LtGray_50" - follows="top|left" - halign="left" - left_pad="3" - name="RenderingCost" - tool_tip="Shows the rendering cost calculated for this object" - top_delta="11" - type="string" - width="100"> - þ: [COUNT] - </text> <check_box control_name="ScaleUniform" height="19" @@ -302,7 +278,7 @@ layout="topleft" left="143" name="checkbox uniform" - top="50" + top="48" width="20" /> <text height="19" @@ -324,53 +300,29 @@ layout="topleft" left="143" name="checkbox stretch textures" - top_pad="-6" + top_pad="-4" follows="left|top" width="134" /> <check_box control_name="SnapEnabled" height="18" initial_value="true" - label="Snap to grid" + label="Snap" layout="topleft" top_pad="0" name="checkbox snap to grid" width="134" /> - <combo_box - height="23" - layout="topleft" - follows="left|top" - name="combobox grid mode" - tool_tip="Choose the type of grid ruler for positioning the object" - top_pad="0" - width="108"> - <combo_box.item - label="World grid" - name="World" - value="World" /> - <combo_box.item - label="Local grid" - name="Local" - value="Local" /> - <combo_box.item - label="Reference grid" - name="Reference" - value="Reference" /> - <combo_box.commit_callback - function="BuildTool.gridMode"/> - </combo_box> <button left_pad="0" - image_selected="ForwardArrow_Press" - image_unselected="ForwardArrow_Off" + label="Options..." layout="topleft" follows="top|left" name="Options..." tool_tip="See more grid options" - top_pad="-22" - right="-10" - width="18" - height="23" > + top="83" + right="-35" + width="65" + height="21" > <button.commit_callback function="BuildTool.gridOptions"/> </button> @@ -385,7 +337,7 @@ left="10" name="ToolCube" tool_tip="Cube" - top="51" + top="58" width="20" /> <button follows="left|top" @@ -447,10 +399,10 @@ image_selected="Object_Hemi_Cylinder_Selected" image_unselected="Object_Hemi_Cylinder" layout="topleft" - left_delta="29" + left="10" name="ToolHemiCylinder" tool_tip="Hemicylinder" - top_delta="0" + top="84" width="20" /> <button follows="left|top" @@ -515,7 +467,7 @@ left="10" name="ToolTorus" tool_tip="Torus" - top="77" + top="109" width="20" /> <button follows="left|top" @@ -575,9 +527,9 @@ height="19" label="Keep Tool selected" layout="topleft" - left="4" + left="155" name="checkbox sticky" - top="101" + top="55" width="128" /> <check_box control_name="CreateToolCopySelection" @@ -596,7 +548,7 @@ layout="topleft" left_delta="18" name="checkbox copy centers" - top="132" + top="85" width="134" /> <check_box control_name="CreateToolCopyRotates" @@ -749,89 +701,49 @@ <button.commit_callback function="BuildTool.applyToSelection"/> </button> + <text + text_color="LtGray_50" + type="string" + length="1" + height="16" + follows="left|top" + font="SansSerifSmall" + layout="topleft" + left="10" + name="selection_empty" + top_pad="0" + width="100"> + Nothing selected. + </text> <text text_color="LtGray_50" type="string" length="1" - height="10" + height="16" follows="left|top" - halign="right" + font="SansSerifSmall" layout="topleft" - right="-10" - name="obj_count" - top_pad="5" - width="143"> - Objects: [COUNT] + left="10" + name="selection_count" + top_delta="0" + visible="false" + width="280"> </text> <text - text_color="LtGray_50" - type="string" - length="1" - height="10" - follows="left|top" - halign="right" - layout="topleft" - right="-10" - name="prim_count" - width="143"> - Prims: [COUNT] + text_color="LtGray_50" + type="string" + length="1" + height="16" + follows="left|top" + font="SansSerifSmall" + layout="topleft" + left="10" + name="selection_weight" + top_pad="0" + visible="false" + width="280"> + Physics weight [PHYS_WEIGHT], Render Cost [DISP_WEIGHT]. </text> - <text - text_color="LtGray_50" - type="string" - length="1" - height="10" - follows="left|top" - halign="right" - layout="topleft" - right="-120" - name="linked_set_count" - top="144" - width="80"> - L: [COUNT] - </text> - <text - text_color="LtGray_50" - type="string" - length="1" - follows="left|top" - halign="right" - layout="topleft" - top_delta="0" - right="-100" - name="object_count" - width="80"> - O: [COUNT] - </text> - <text - text_color="LtGray_50" - type="string" - length="1" - height="10" - follows="left|top" - halign="right" - layout="topleft" - top_delta="0" - right="-8" - name="linked_set_cost" - tool_tip="Cost of currently selected linked sets as [prims],[physics complexity]" - width="80"> - Cost: [COST] / [PHYSICS] - </text> - <text - text_color="LtGray_50" - type="string" - length="1" - follows="left|top" - halign="right" - layout="topleft" - top_pad="5" - right="-8" - name="object_cost" - tool_tip="Cost of currently selected objects as [prims] / [physics complexity]" - width="80"> - Cost: [COST] / [PHYSICS] - </text> <!-- <text --> <!-- text_color="LtGray_50" --> <!-- type="string" --> @@ -858,6 +770,15 @@ <!-- width="143"> --> <!-- Prims: [COUNT] --> <!-- </text> --> + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="6" + name="cost_text_border" + top="135" + width="282"/> <tab_container follows="left|top" height="410" @@ -1608,41 +1529,6 @@ even though the user gets a free copy. name="Sculpted" value="Sculpted" /> </combo_box> - <combo_box - height="19" - layout="topleft" - name="material" - top_pad="5" - width="150"> - <combo_box.item - label="Stone" - name="Stone" - value="Stone" /> - <combo_box.item - label="Metal" - name="Metal" - value="Metal" /> - <combo_box.item - label="Glass" - name="Glass" - value="Glass" /> - <combo_box.item - label="Wood" - name="Wood" - value="Wood" /> - <combo_box.item - label="Flesh" - name="Flesh" - value="Flesh" /> - <combo_box.item - label="Plastic" - name="Plastic" - value="Plastic" /> - <combo_box.item - label="Rubber" - name="Rubber" - value="Rubber" /> - </combo_box> <text type="string" length="1" @@ -2133,11 +2019,7 @@ even though the user gets a free copy. label="Cylinder" name="Cylinder" value="Cylinder" /> - <combo_box.item - label="Mesh" - name="Mesh" - value="Mesh" /> - </combo_box> + </combo_box> </panel> <panel border="false" @@ -2426,6 +2308,41 @@ even though the user gets a free copy. name="Physics Shape Type Combo Ctrl" tool_tip="Choose the physics shape type" width="108"/> + <combo_box + height="19" + layout="topleft" + name="material" + top_pad="5" + width="150"> + <combo_box.item + label="Stone" + name="Stone" + value="Stone" /> + <combo_box.item + label="Metal" + name="Metal" + value="Metal" /> + <combo_box.item + label="Glass" + name="Glass" + value="Glass" /> + <combo_box.item + label="Wood" + name="Wood" + value="Wood" /> + <combo_box.item + label="Flesh" + name="Flesh" + value="Flesh" /> + <combo_box.item + label="Plastic" + name="Plastic" + value="Plastic" /> + <combo_box.item + label="Rubber" + name="Rubber" + value="Rubber" /> + </combo_box> <spinner follows="left|top" @@ -2441,16 +2358,6 @@ even though the user gets a free copy. top_pad="10" width="132" /> - <check_box - height="19" - label="Override material" - layout="topleft" - left_delta="0" - name="Physics Material Override" - tool_tip="Override Material" - top_pad="10" - width="132" /> - <spinner follows="left|top" height="19" @@ -2471,8 +2378,9 @@ even though the user gets a free copy. height="19" increment="0.1" initial_value="0" - label="Density" + label="Density in 100 kg/m^3" label_width="70" + label_wrap="true" layout="topleft" left_delta="0" max_val="22587" @@ -2493,7 +2401,7 @@ even though the user gets a free copy. max_val="1" min_val="0" name="Physics Restitution" - top_pad="4" + top_pad="8" width="132" /> </panel> <panel diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index b06c6dc215..4dfdcd15c7 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -105,7 +105,7 @@ left_delta="0" name="id_text" top_pad="10" - width="100"> + width="107"> Object ID: </text> <line_editor @@ -116,7 +116,7 @@ left_pad="3" name="id_editor" top_delta="-3" - width="575" /> + width="568" /> <button follows="bottom|right" height="23" @@ -138,7 +138,7 @@ left="10" top_pad="5" name="obj_name_text" - width="100"> + width="107"> Object name: </text> <line_editor @@ -148,7 +148,7 @@ left_pad="3" name="object_name_editor" top_delta="-3" - width="575" /> + width="568" /> <button follows="bottom|right" height="23" @@ -170,7 +170,7 @@ left="10" top_pad="5" name="owner_name_text" - width="100"> + width="107"> Owner: </text> <line_editor @@ -180,7 +180,7 @@ left_pad="3" name="owner_name_editor" top_delta="-3" - width="575" /> + width="568" /> <button follows="bottom|right" height="23" diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml deleted file mode 100644 index 3a44ba3763..0000000000 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ /dev/null @@ -1,503 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="240" - layout="topleft" - name="Water Floater" - help_topic="water_floater" - save_rect="true" - title="ADVANCED WATER EDITOR" - width="700"> - <floater.string - name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - height="16" - layout="topleft" - left="10" - name="KeyFramePresetsText" - top="34" - font="SansSerif" - width="85"> - Water Presets: - </text> - <combo_box - height="23" - layout="topleft" - left_delta="95" - name="WaterPresetsCombo" - top_delta="-4" - width="150" /> - <button - height="23" - label="New" - label_selected="New" - layout="topleft" - left_pad="3" - name="WaterNewPreset" - top_delta="0" - width="70" /> - <button - height="23" - label="Save" - label_selected="Save" - layout="topleft" - left_pad="3" - name="WaterSavePreset" - top_delta="0" - width="70" /> - <button - height="23" - label="Delete" - label_selected="Delete" - layout="topleft" - left_pad="3" - name="WaterDeletePreset" - top_delta="0" - width="70" /> - <tab_container - border="false" - follows="left|top" - height="180" - halign="center" - layout="topleft" - left="0" - name="Water Tabs" - tab_position="top" - top="60" - width="700"> - <panel - border="true" - follows="all" - height="180" - label="SETTINGS" - layout="topleft" - left="0" - mouse_opaque="false" - help_topic="water_settings_tab" - name="Settings" - top="0" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="BHText" - top="4" - width="200"> - Water Fog Color - </text> - <color_swatch - can_apply_immediately="true" - color="0.5 0.5 0.5 1" - follows="left|top" - height="50" - layout="topleft" - left="40" - name="WaterFogColor" - tool_tip="Click to open color picker" - top="30" - width="40" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="WaterFogDensText" - top="84" - width="200"> - Fog Density Exponent - </text> - <slider - control_name="WaterFogDensity" - decimal_digits="1" - follows="left" - height="10" - initial_value="16" - layout="topleft" - left="24" - max_val="10" - name="WaterFogDensity" - top="124" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="WaterUnderWaterFogModText" - top="124" - width="200"> - Underwater Fog Modifier - </text> - <slider - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="16" - layout="topleft" - left="24" - max_val="2" - name="WaterUnderWaterFogMod" - top="164" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="BDensText" - top="4" - width="200"> - Reflection Wavelet Scale - </text> - <slider - control_name="WaterNormalScaleX" - decimal_digits="1" - follows="left" - height="15" - initial_value="0.7" - label="1" - layout="topleft" - max_val="10" - name="WaterNormalScaleX" - top_pad="24" - width="200" /> - <slider - control_name="WaterNormalScaleY" - decimal_digits="1" - follows="left" - height="15" - initial_value="0.7" - label="2" - layout="topleft" - max_val="10" - name="WaterNormalScaleY" - top_pad="4" - width="200" /> - <slider - control_name="WaterNormalScaleZ" - decimal_digits="1" - follows="left" - height="15" - initial_value="0.7" - label="3" - layout="topleft" - max_val="10" - name="WaterNormalScaleZ" - top_pad="4" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - name="HDText" - top="84" - width="200"> - Fresnel Scale - </text> - <slider - control_name="WaterFresnelScale" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - name="WaterFresnelScale" - top="124" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - name="FresnelOffsetText" - top="124" - width="200"> - Fresnel Offset - </text> - <slider - control_name="WaterFresnelOffset" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - name="WaterFresnelOffset" - top="164" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="DensMultText" - top="4" - width="200"> - Refract Scale Above - </text> - <slider - control_name="WaterScaleAbove" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - layout="topleft" - left="494" - name="WaterScaleAbove" - top="44" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="WaterScaleBelowText" - top="44" - width="200"> - Refract Scale Below - </text> - <slider - control_name="WaterScaleBelow" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0" - layout="topleft" - left="494" - name="WaterScaleBelow" - top="84" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="MaxAltText" - top="84" - width="200"> - Blur Multiplier - </text> - <slider - control_name="WaterBlurMult" - follows="left" - height="10" - increment="0.001" - initial_value="0" - layout="topleft" - left="494" - max_val="0.16" - name="WaterBlurMult" - top="124" - width="200" /> - </panel> - <panel - border="true" - follows="all" - height="180" - label="IMAGE" - layout="topleft" - left="0" - mouse_opaque="false" - help_topic="water_waves_tab" - name="Waves" - top="0" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="BHText" - top="4" - width="200"> - Big Wave Direction - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - name="WaterWave1DirXText" - top_pad="5" - width="10"> - X - </text> - <slider - control_name="WaterWave1DirX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - max_val="4" - min_val="-4" - name="WaterWave1DirX" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="WaterWave1DirYText" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WaterWave1DirY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="4" - min_val="-4" - name="WaterWave1DirY" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-10" - width="355"> - Little Wave Direction - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - left_delta="0" - name="WaterWave2DirXText" - top_pad="5" - width="10"> - X - </text> - <slider - control_name="WaterWave2DirX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - max_val="4" - min_val="-4" - name="WaterWave2DirX" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="WaterWave2DirYText" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WaterWave2DirY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="4" - min_val="-4" - name="WaterWave2DirY" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="240" - name="BHText3" - top="4" - width="200"> - Normal Map - </text> - <texture_picker - height="143" - layout="topleft" - left="250" - name="WaterNormalMap" - top="22" - width="128" /> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index e04a72cbc0..69e6057556 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -18,6 +18,7 @@ follows="left|right|top|bottom" layout="topleft" left="5" + animate="false" name="stack1" orientation="vertical" top="20" @@ -156,14 +157,20 @@ name="external_controls" top_delta="0" user_resize="false" + auto_resize="true" width="585"> <web_browser - bottom="-22" + bottom="-2" follows="all" layout="topleft" left="0" name="webbrowser" top="0"/> + </layout_panel> + <layout_panel name="status_bar" + height="23" + auto_resize="false" + user_resize="false"> <text type="string" length="200" @@ -174,7 +181,7 @@ name="statusbartext" parse_urls="false" text_color="0.4 0.4 0.4 1" - top_pad="5" + top_pad="3" width="495"/> <progress_bar color_bar="0.3 1.0 0.3 1" diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml deleted file mode 100644 index 249ad95c41..0000000000 --- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml +++ /dev/null @@ -1,1288 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="256" - layout="topleft" - name="WindLight floater" - help_topic="windlight_floater" - save_rect="true" - title="ADVANCED SKY EDITOR" - width="700"> - <floater.string - name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="KeyFramePresetsText" - top="34" - width="85"> - Sky Presets: - </text> - <combo_box - height="23" - layout="topleft" - left_delta="85" - name="WLPresetsCombo" - top_delta="-4" - width="150" /> - <button - height="23" - label="New" - label_selected="New" - layout="topleft" - left_pad="3" - name="WLNewPreset" - width="70" /> - <button - height="23" - label="Save" - label_selected="Save" - layout="topleft" - left_pad="3" - name="WLSavePreset" - width="70" /> - <button - height="23" - label="Delete" - label_selected="Delete" - layout="topleft" - left_pad="3" - name="WLDeletePreset" - width="70" /> - <button - height="23" - label="Day Cycle Editor" - label_selected="Day Cycle Editor" - layout="topleft" - right="-10" - name="WLDayCycleMenuButton" - top_pad="-23" - width="120" /> - <tab_container - follows="left|top" - height="196" - halign="center" - layout="topleft" - left="0" - name="WindLight Tabs" - tab_position="top" - top="60" - width="700"> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="ATMOSPHERE" - layout="topleft" - left="1" - mouse_opaque="false" - help_topic="windlight_atmosphere_tab" - name="Atmosphere" - top="60" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="BHText" - top="4" - width="355"> - Blue Horizon - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - name="BHText2" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLBlueHorizonR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLBlueHorizonR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - top_pad="-15" - name="BHText3" - width="10"> - G - </text> - <slider - control_name="WLBlueHorizonG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueHorizonG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - name="BHText4" - left="10" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLBlueHorizonB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - name="WLBlueHorizonB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - name="BHText5" - left="10" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLBlueHorizonI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - name="WLBlueHorizonI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - top_pad="-10" - name="BDensText" - width="355"> - Haze Horizon - </text> - <slider - control_name="WLHazeHorizon" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.25" - layout="topleft" - left="23" - top_delta="0" - top_pad="27" - name="WLHazeHorizon" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="BDensText2" - top="4" - width="355"> - Blue Density - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText6" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLBlueDensityR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLBlueDensityR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText7" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLBlueDensityG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueDensityG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText8" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLBlueDensityB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueDensityB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText9" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLBlueDensityI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1" - layout="topleft" - left_delta="0" - name="WLBlueDensityI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="HDText" - top_pad="-10" - width="355"> - Haze Density - </text> - <slider - control_name="WLHazeDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="258" - max_val="4" - name="WLHazeDensity" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="DensMultText" - top="4" - width="355"> - Density Multiplier - </text> - <slider - control_name="WLDensityMult" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - layout="topleft" - left_delta="13" - max_val="0.9" - name="WLDensityMult" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLDistanceMultText" - top_pad="-10" - width="355"> - Distance Multiplier - </text> - <slider - control_name="WLDistancMult" - decimal_digits="1" - follows="left" - height="10" - initial_value="1.0" - layout="topleft" - left_delta="13" - max_val="100" - name="WLDistanceMult" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="MaxAltText" - top_pad="-15" - width="355"> - Max Altitude - </text> - <slider - control_name="WLMaxAltitude" - decimal_digits="0" - follows="left" - height="10" - increment="1" - initial_value="500" - layout="topleft" - left_delta="13" - max_val="4000" - name="WLMaxAltitude" - top_pad="27" - width="200" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="LIGHTING" - layout="topleft" - left_delta="0" - help_topic="windlight_lighting_tab" - name="Lighting" - top_delta="4" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="SLCText" - top="4" - width="355"> - Sun/Moon Color - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLSunlightR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLSunlightR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLSunlightG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLSunlightG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText3" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLSunlightB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLSunlightB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText4" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLSunlightI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLSunlightI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="TODText" - top_pad="-10" - width="355"> - Sun/Moon Position - </text> - <icon - height="20" - image_name="icon_diurnal.tga" - layout="topleft" - left_delta="14" - top_pad="10" - name="SkyDayCycle" - use_draw_context_alpha="false" - width="148" /> - <slider - control_name="WLSunAngle" - follows="left" - height="10" - increment="0.001" - initial_value="0.7" - layout="topleft" - left_delta="-8" - name="WLSunAngle" - top_pad="20" - width="207" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="WLAmbientText" - top="4" - width="355"> - Ambient - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText5" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLAmbientR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLAmbientR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText6" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLAmbientG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLAmbientG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText7" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLAmbientB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLAmbientB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText8" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLAmbientI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1" - layout="topleft" - left_delta="0" - name="WLAmbientI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLEastAngleText" - top_pad="-10" - width="355"> - East Angle - </text> - <slider - control_name="WLEastAngle" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.0" - layout="topleft" - left_delta="13" - name="WLEastAngle" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="SunGlowText" - top="4" - width="355"> - Sun Glow - </text> - <slider - control_name="WLGlowB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - label="Focus " - layout="topleft" - left_delta="0" - max_val="0.5" - name="WLGlowB" - top_pad="27" - width="200" /> - <slider - control_name="WLGlowR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.25" - label="Size " - layout="topleft" - left_delta="0" - max_val="1.99" - min_val="1" - name="WLGlowR" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="SceneGammaText" - top_pad="-10" - width="200"> - Scene Gamma - </text> - <slider - control_name="WLGamma" - decimal_digits="2" - follows="bottom" - height="10" - increment="0.01" - initial_value="2.0" - layout="topleft" - left_delta="0" - max_val="10" - name="WLGamma" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="WLStarText" - top_pad="-10" - width="355"> - Star Brightness - </text> - <slider - control_name="WLStarAlpha" - decimal_digits="2" - follows="bottom" - height="10" - increment="0.01" - initial_value="0" - layout="topleft" - left_delta="0" - max_val="2" - name="WLStarAlpha" - top_pad="27" - width="200" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="CLOUDS" - layout="topleft" - left_delta="0" - mouse_opaque="false" - help_topic="windlight_clouds_tab" - name="Clouds" - top_delta="4" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="WLCloudColorText" - top="4" - width="355"> - Cloud Color - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLCloudColorR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudColorR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLCloudColorG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLCloudColorG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText3" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLCloudColorB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLCloudColorB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText4" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLCloudColorI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudColorI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudColorText2" - top_pad="-10" - width="355"> - Cloud XY/Density - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText5" - top_pad="5" - width="10"> - X - </text> - <slider - control_name="WLCloudX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudX" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText6" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WLCloudY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudY" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText7" - top_pad="-15" - width="10"> - D - </text> - <slider - control_name="WLCloudDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudDensity" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="WLCloudCoverageText" - top="4" - width="355"> - Cloud Coverage - </text> - <slider - control_name="WLCloudCoverage" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="13" - name="WLCloudCoverage" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudScaleText" - top_pad="-10" - width="355"> - Cloud Scale - </text> - <slider - control_name="WLCloudScale" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="13" - min_val="0.01" - name="WLCloudScale" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudDetailText" - top_pad="-10" - width="355"> - Cloud Detail (XY/Density) - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText8" - top_pad="8" - width="10"> - X - </text> - <slider - control_name="WLCloudDetailX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="8" - name="WLCloudDetailX" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText9" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WLCloudDetailY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="0" - name="WLCloudDetailY" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText10" - top_pad="-15" - width="10"> - D - </text> - <slider - control_name="WLCloudDetailDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudDetailDensity" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="WLCloudScrollXText" - top="4" - width="355"> - Cloud Scroll X - </text> - <check_box - control_name="WLCloudLockX" - follows="left" - height="16" - label="Lock" - layout="topleft" - left="625" - name="WLCloudLockX" - width="200" /> - <slider - control_name="WLCloudScrollX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left="494" - max_val="10" - min_val="-10" - name="WLCloudScrollX" - top="45" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="WLCloudScrollYText" - top_delta="-1" - width="355"> - Cloud Scroll Y - </text> - <check_box - control_name="WLCloudLockY" - follows="left" - height="16" - label="Lock" - layout="topleft" - left="625" - name="WLCloudLockY" - width="200" /> - <slider - control_name="WLCloudScrollY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left="494" - max_val="10" - min_val="-10" - name="WLCloudScrollY" - top="85" - width="200" /> - <check_box - control_name="DrawClassicClouds" - follows="left" - height="16" - label="Draw Classic Clouds" - layout="topleft" - left="480" - name="DrawClassicClouds" - top="104" - width="200" /> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml index c8a06fe401..51779e4bfd 100644 --- a/indra/newview/skins/default/xui/en/language_settings.xml +++ b/indra/newview/skins/default/xui/en/language_settings.xml @@ -4,6 +4,7 @@ <!-- Locale Information --> <string name="MicrosoftLocale">english</string> + <string name="MacLocale">C</string> <string name="DarwinLocale">C</string> <string name="LinuxLocale">C</string> diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 3ead67ca57..a7d1aa963c 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -135,6 +135,14 @@ name="login_panel_holder" width="1024"/> + <debug_view follows="all" + left="0" + top="0" + mouse_opaque="false" + height="500" + name="DebugView" + width="1024"/> + <panel follows="all" height="500" left="0" @@ -154,13 +162,6 @@ top="0" width="1024"/> </panel> - <debug_view follows="all" - left="0" - top="0" - mouse_opaque="false" - height="500" - name="DebugView" - width="1024"/> </layout_panel> </layout_stack> <panel mouse_opaque="false" diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml index 484af63097..0f42000ae7 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -42,7 +42,7 @@ <menu_item_call.on_enable function="File.EnableUpload" /> </menu_item_call> - <menu_item_call + <menu_item_call label="Model..." layout="topleft" name="Upload Model"> @@ -251,4 +251,4 @@ parameter="eyes" /> </menu_item_call> </menu> -</menu> +</menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 0d4a095e14..4c4ff3e5c4 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -183,11 +183,11 @@ parameter="http://join.secondlife.com/"/> </menu_item_call> <menu_item_call - label="Web Content Floater Test" - name="Web Content Floater Test"> + label="Web Content Floater Debug Test" + name="Web Content Floater Debug Test"> <menu_item_call.on_click function="Advanced.WebContentTest" - parameter="http://www.google.com"/> + parameter="http://google.com"/> </menu_item_call> <menu_item_check label="Show Grid Picker" diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml index f9db64b524..65bd2793b6 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml @@ -42,6 +42,14 @@ function="CheckControl" parameter="NearbyListShowIcons" /> </menu_item_check> + <menu_item_check name ="view_map" label="View Map"> + <menu_item_check.on_check + function="CheckControl" + parameter="NearbyListShowMap" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="NearbyListShowMap" /> + </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" /> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 3b268a1937..caa037576b 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -232,6 +232,16 @@ function="SideTray.PanelPeopleTab" parameter="nearby_panel" /> </menu_item_call> + <menu_item_check + label="Nearby Voice" + name="Nearby Voice"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="voice_controls" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="voice_controls" /> + </menu_item_check> </menu> <menu create_jump_keys="true" @@ -470,7 +480,7 @@ <menu_item_separator/> - <menu + <menu create_jump_keys="true" label="Sun" name="Environment Settings" @@ -505,24 +515,105 @@ function="World.EnvSettings" parameter="midnight" /> </menu_item_call> - <menu_item_call - label="Estate Time" - name="Revert to Region Default"> - <menu_item_call.on_click - function="World.EnvSettings" - parameter="default" /> - </menu_item_call> - - <menu_item_separator/> - - <menu_item_call - label="Environment Editor" - name="Environment Editor"> - <menu_item_call.on_click - function="World.EnvSettings" - parameter="editor" /> - </menu_item_call> </menu> + + + <menu + create_jump_keys="true" + label="Enviroment Editor" + name="Enviroment Editor" + tear_off="true"> + + <menu_item_call + label="Enviroment Settings..." + name="Enviroment Settings"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="editor"/> + </menu_item_call> + + <menu_item_separator/> + + <menu + name="Water Presets" + label="Water Presets"> + <menu_item_call + label="New preset..." + name="new_water_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="new_water"/> + </menu_item_call> + <menu_item_call + label="Edit preset..." + name="edit_water_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="edit_water"/> + </menu_item_call> + <menu_item_call + label="Delete preset..." + name="delete_water_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="delete_water"/> + </menu_item_call> + </menu> + + <menu + name="Sky Presets" + label="Sky Presets"> + <menu_item_call + label="New preset..." + name="new_sky_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="new_sky"/> + </menu_item_call> + <menu_item_call + label="Edit preset..." + name="edit_sky_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="edit_sky"/> + </menu_item_call> + <menu_item_call + label="Delete preset..." + name="delete_sky_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="delete_sky"/> + </menu_item_call> + </menu> + + <menu + name="Day Presets" + label="Day Presets"> + <menu_item_call + label="New preset..." + name="new_day_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="new_day_cycle"/> + </menu_item_call> + <menu_item_call + label="Edit preset..." + name="edit_day_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="edit_day_cycle"/> + </menu_item_call> + <menu_item_call + label="Delete preset..." + name="delete_day_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="delete_day_cycle"/> + </menu_item_call> + </menu> + </menu> + + </menu> <menu create_jump_keys="true" @@ -983,19 +1074,7 @@ <menu_item_call.on_visible function="File.VisibleUploadModel"/> </menu_item_call> - <menu_item_call - label="Model Wizard..." - layout="topleft" - name="Upload Model Wizard"> - <menu_item_call.on_click - function="Floater.Show" - parameter="upload_model_wizard" /> - <menu_item_call.on_enable - function="File.EnableUploadModel" /> - <menu_item_call.on_visible - function="File.VisibleUploadModel"/> - </menu_item_call> - <menu_item_call + <menu_item_call label="Bulk (L$[COST] per file)..." layout="topleft" name="Bulk Upload"> @@ -1997,15 +2076,14 @@ </menu_item_check> <menu_item_check label="Show Upload Cost" - layout="topleft" name="Show Upload Cost"> - <menu_item_check.on_check + <menu_item_check.on_check function="CheckControl" parameter="DebugShowUploadCost" /> <menu_item_check.on_click - function="ToggleControl" - parameter="DebugShowUploadCost" /> - </menu_item_check> + function="ToggleControl" + parameter="DebugShowUploadCost" /> + </menu_item_check> <menu_item_check label="Show Render Info" name="Show Render Info"> @@ -2016,7 +2094,7 @@ function="ToggleControl" parameter="DebugShowRenderInfo" /> </menu_item_check> - <menu_item_check + <menu_item_check label="Show Texture Info" name="Show Texture Info"> <menu_item_check.on_check @@ -2358,6 +2436,16 @@ function="Advanced.ToggleInfoDisplay" parameter="rendercomplexity" /> </menu_item_check> + <menu_item_check + label="Sculpt" + name="Sculpt"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="sculpt" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="sculpt" /> + </menu_item_check> </menu> <menu create_jump_keys="true" diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml index 0ac2c14253..0e858ccf10 100644 --- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml @@ -20,4 +20,11 @@ function="Gear.OnEnable" parameter="take_off" /> </menu_item_call> + <menu_item_call + label="Copy outfit list to clipboard" + layout="topleft" + name="copy"> + <on_click + function="Gear.Copy" /> + </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index b3b9e7f502..6e2596a49e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3698,6 +3698,19 @@ Join me in [REGION] <notification icon="alertmodal.tga" + name="TooManyTeleportOffers" + type="alertmodal"> +You attempted to make [OFFERS] teleport offers +which exceeds the limit of [LIMIT]. + <tag>group</tag> + <tag>fail</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="OfferTeleportFromGod" type="alertmodal"> God summon Resident to your location? @@ -4763,6 +4776,18 @@ Are you sure you want to delete your travel, web, and search history? notext="Cancel" yestext="OK"/> </notification> + + <notification + icon="alertmodal.tga" + name="ConfirmClearCache" + type="alertmodal"> +Are you sure you want to clear your viewer cache? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> <notification icon="alertmodal.tga" @@ -4829,18 +4854,6 @@ Do you wish to overwrite the saved preset? <notification icon="alertmodal.tga" - name="WLDeletePresetAlert" - type="alertmodal"> -Do you wish to delete [SKY]? - <tag>confirm</tag> - <usetemplate - name="okcancelbuttons" - notext="No" - yestext="Yes"/> - </notification> - - <notification - icon="alertmodal.tga" name="WLNoEditDefault" type="alertmodal"> You cannot edit or delete a default preset. @@ -4857,81 +4870,53 @@ This day cycle file references a missing sky file: [SKY]. <notification icon="alertmodal.tga" - name="PPSaveEffectAlert" + name="WLRegionApplyFail" type="alertmodal"> -PostProcess Effect exists. Do you still wish overwrite it? - <usetemplate - name="okcancelbuttons" - notext="No" - yestext="Yes"/> - </notification> - - <notification - icon="alert.tga" - name="NewSkyPreset" - type="alert"> -Give me a name for the new sky. - <tag>confirm</tag> - <form name="form"> - <input name="message" type="text"> -New Preset - </input> - <button - default="true" - index="0" - name="OK" - text="OK"/> - <button - index="1" - name="Cancel" - text="Cancel"/> - </form> +Sorry, the settings couldn't be applied to the region. Leaving the region and then returning may help rectify the problem. The reason given was: [FAIL_REASON] </notification> <notification + functor="GenericAcknowledge" icon="alertmodal.tga" - name="ExistsSkyPresetAlert" + name="EnvCannotDeleteLastDayCycleKey" type="alertmodal"> -Preset already exists! - <tag>fail</tag> +Unable to delete the last key in this day cycle because you cannot have an empty day cycle. You should modify the last remaining key instead of attempting to delete it and then to create a new one. + <usetemplate + name="okbutton" + yestext="OK"/> </notification> <notification - icon="alert.tga" - name="NewWaterPreset" - type="alert"> -Give me a name for the new water preset. - <tag>confirm</tag> - <form name="form"> - <input name="message" type="text"> -New Preset - </input> - <button - default="true" - index="0" - name="OK" - text="OK"/> - <button - index="1" - name="Cancel" - text="Cancel"/> - </form> + functor="GenericAcknowledge" + icon="alertmodal.tga" + name="DayCycleTooManyKeyframes" + type="alertmodal"> +You cannot add any more keyframes to this day cycle. The maximum number of keyframes for day cycles of [SCOPE] scope is [MAX]. + <usetemplate + name="okbutton" + yestext="OK"/> </notification> <notification + functor="GenericAcknowledge" icon="alertmodal.tga" - name="ExistsWaterPresetAlert" + name="EnvUpdateRate" type="alertmodal"> -Preset already exists! - <tag>fail</tag> + You may only update region environmental settings every [WAIT] seconds. Wait at least that long and then try again. + <usetemplate + name="okbutton" + yestext="OK"/> </notification> <notification icon="alertmodal.tga" - name="WaterNoEditDefault" + name="PPSaveEffectAlert" type="alertmodal"> -You cannot edit or delete a default preset. - <tag>fail</tag> +PostProcess Effect exists. Do you still wish overwrite it? + <usetemplate + name="okcancelbuttons" + notext="No" + yestext="Yes"/> </notification> <notification @@ -5227,6 +5212,20 @@ Insufficient permissions to rez object. <notification icon="notifytip.tga" + name="IMAcrossParentEstates" + type="notifytip"> +Unable to send IM across parent estates. + </notification> + + <notification + icon="notifytip.tga" + name="TransferInventoryAcrossParentEstates" + type="notifytip"> +Unable to transfer inventory across parent estates. + </notification> + + <notification + icon="notifytip.tga" name="UnableToLoadNotecard" type="notifytip"> Unable to load notecard. @@ -5629,6 +5628,15 @@ This area has building disabled. You can't build or rez objects here. <notification icon="notify.tga" + name="SeeAvatars" + persist="true" + type="notify" + unique="true"> +This parcel hides avatars and text chat from another parcel. You can't see other residents outside the parcel, and those outside are not able to see you. Regular text chat on channel 0 is also blocked. + </notification> + + <notification + icon="notify.tga" name="ScriptsStopped" persist="true" type="notify"> @@ -6797,7 +6805,23 @@ Select residents to share with. name="MeshUploadError" icon="alert.tga" type="alert"> - [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER] + [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] + +See the log file for details. + </notification> + + <notification + name="MeshUploadPermError" + icon="alert.tga" + type="alert"> + Error while requesting mesh upload permissons. + </notification> + + <notification + name="RegionCapabilityRequestError" + icon="alert.tga" + type="alert"> + Could not get region capability '[CAPABILITY]'. </notification> <notification @@ -7317,8 +7341,6 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm ' notext="Don't Quit"/> </notification> - </global> - <global name="UnsupportedGLRequirements"> You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system. diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml index f438e3d42d..9e70706603 100644 --- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml @@ -52,10 +52,7 @@ multi_select="true" name="list_attachments" top="0" - width="311"> - <flat_list_view.no_items_text - value="No attachments worn" /> - </flat_list_view> + width="311"/> </accordion_tab> <accordion_tab layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 82dfb445da..2ec2e03e8c 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -220,7 +220,7 @@ height="23" layout="topleft" left_pad="4" - name="layout_panel1" + name="layout_panel2" user_resize="false" auto_resize="true" width="146"> diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 600b0e3b71..607e1bb213 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -84,7 +84,7 @@ Maximum 200 per group daily name="create_new_notice" tool_tip="Create a new notice" top_delta="0" - width="93" /> + width="127" /> <button follows="top|left" height="23" @@ -128,7 +128,7 @@ Maximum 200 per group daily layout="topleft" name="lbl3" top_pad="10" - width="60"> + width="62"> Subject: </text> <line_editor @@ -141,7 +141,7 @@ Maximum 200 per group daily max_length_bytes="63" name="create_subject" prevalidate_callback="ascii" - width="220" /> + width="218" /> <text follows="left|top" type="string" @@ -151,7 +151,7 @@ Maximum 200 per group daily left="10" name="lbl4" top_pad="5" - width="60"> + width="62"> Message: </text> <text_editor @@ -162,7 +162,7 @@ Maximum 200 per group daily max_length="511" name="create_message" top_delta="0" - width="220" + width="218" word_wrap="true" /> <text follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml new file mode 100644 index 0000000000..d06190ec54 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inbox_inventory_panel + name="inventory_inbox" + start_folder="Received Items" + follows="all" layout="topleft" + top="0" left="0" height="165" width="308" + top_pad="0" + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + border="false" + bevel_style="none" + show_item_link_overlays="true" + > + <scroll reserve_scroll_corner="false" /> +</inbox_inventory_panel> diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml index 38e8b9844f..cdf14572fe 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -196,7 +196,7 @@ initial_val="256" label="" label_width="0" - left_delta="40" + left_delta="68" max_val="2048" min_val="0" mouse_opaque="true" diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index 9bd60b935f..bfc503f05b 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -104,12 +104,12 @@ top_pad="15" left="10" name="show_text" - width="40"> + width="62"> Show: </text> <combo_box height="23" - left="50" + left="72" width="140" top_delta="-5" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml new file mode 100644 index 0000000000..af32056428 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inventory_panel + name="inventory_outbox" + start_folder="Outbox" + follows="all" layout="topleft" + top="0" left="0" height="165" width="308" + top_pad="0" + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + border="false" + bevel_style="none" + show_item_link_overlays="true" + > + <scroll reserve_scroll_corner="false" /> +</inventory_panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml index 9f98019c94..a0096adc01 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml @@ -14,9 +14,7 @@ background_visible="true" bg_alpha_color="DkGray2" bg_opaque_color="DkGray2" - no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]." - no_matched_tabs_text.v_pad="10" - no_visible_tabs_text.value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]" + follows="all" height="400" layout="topleft" @@ -24,6 +22,13 @@ name="outfits_accordion" top="0" width="309"> + <no_matched_tabs_text + name="no_matched_outfits_msg" + value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]." + v_pad="10"/> + <no_visible_tabs_text + name="no_outfits_msg" + value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]"/> </accordion> <panel background_visible="true" diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 1a00416b2a..cc4522f944 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -87,7 +87,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M width="319"> <panel background_opaque="true" - background_visible="true" + background_visible="true" bg_alpha_color="DkGray" bg_opaque_color="DkGray" follows="all" @@ -99,28 +99,55 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M name="nearby_panel" top="0" width="313"> - <net_map - bg_color="NetMapBackgroundColor" - follows="top|left|right" - layout="topleft" - left="3" - mouse_opaque="false" - name="Net Map" - width="305" - height="140" - top="5"/> - <avatar_list - allow_select="true" - follows="top|left|bottom|right" - height="211" - ignore_online_status="true" + <layout_stack + clip="false" + follows="all" + height="355" + layout="topleft" + mouse_opaque="false" + orientation="vertical" + width="313"> + <layout_panel + height="142" layout="topleft" - left="3" - multi_select="true" - name="avatar_list" - top="145" - width="306" /> - <panel + min_dim="100" + mouse_opaque="false" + user_resize="true" + visibility_control="NearbyListShowMap" + width="313"> + <net_map + bg_color="NetMapBackgroundColor" + follows="all" + height="140" + layout="topleft" + left="3" + mouse_opaque="false" + name="Net Map" + top="4" + width="305"/> + </layout_panel> + <layout_panel + height="213" + layout="topleft" + min_dim="100" + mouse_opaque="false" + user_resize="true" + width="313"> + <avatar_list + allow_select="true" + follows="all" + height="211" + ignore_online_status="true" + layout="topleft" + left="3" + keep_one_selected="false" + multi_select="true" + name="avatar_list" + top="2" + width="306" /> + </layout_panel> + </layout_stack> + <panel background_visible="true" follows="left|right|bottom" height="27" @@ -595,7 +622,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M height="23" layout="bottomleft" left_pad="3" - name="chat_btn_lp" + name="im_btn_lp" user_resize="false" auto_resize="true" width="41"> @@ -616,7 +643,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M height="23" layout="bottomleft" left_pad="3" - name="chat_btn_lp" + name="call_btn_lp" user_resize="false" auto_resize="true" width="52"> @@ -637,7 +664,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M height="23" layout="bottomleft" left_pad="3" - name="chat_btn_lp" + name="share_btn_lp" user_resize="false" auto_resize="true" width="66"> @@ -658,7 +685,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M height="23" layout="bottomleft" left_pad="3" - name="chat_btn_lp" + name="teleport_btn_lp" user_resize="false" auto_resize="true" width="77"> 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 774a9e8bbf..e280115bda 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -153,6 +153,14 @@ name="icon_DamageNo" translate="false" value="Parcel_DamageNo_Dark" /> + <string + name="icon_SeeAVs_Off" + translate="false" + value="Parcel_SeeAVsOff_Dark" /> + <string + name="icon_SeeAVs_On" + translate="false" + value="Parcel_SeeAVsOn_Dark" /> <button follows="top|left" height="24" @@ -354,7 +362,7 @@ title="Parcel"> <panel follows="all" - height="175" + height="200" layout="topleft" left="0" name="parcel_characteristics_panel" @@ -543,6 +551,31 @@ top_delta="0" value="Off" width="60" /> + <icon + follows="top|left" + height="18" + image_name="Parcel_SeeAVsOff_Dark" + layout="topleft" + left="10" + name="see_avatars_icon" + top_pad="7" + width="22" /> + <text + follows="left|top" + height="14" + layout="topleft" + left_pad="8" + name="see_avatars_label" + value="See Avatars:" + width="90" /> + <text + follows="left|top" + height="14" + layout="topleft" + left_pad="0" + name="see_avatars_value" + value="Off" + width="60" /> <button follows="bottom|right" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 37aab059a9..2cc9d9c1b0 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -20,8 +20,112 @@ height="12" layout="topleft" left="33" + name="Cache:" + top_pad="10" + width="100"> + Cache: + </text> + <spinner + control_name="CacheSize" + decimal_digits="0" + follows="left|top" + height="23" + increment="64" + initial_value="1024" + label="Cache size (64 - 9984MB)" + label_width="150" + layout="topleft" + left="80" + max_val="9984" + min_val="64" + top_pad="10" + name="cachesizespinner" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_box5" + width="20"> + MB + </text> + <button + follows="left|top" + height="23" + label="Clear Cache" + label_selected="Clear Cache" + layout="topleft" + left_pad="30" + name="clear_cache" + top_delta="0" + width="100"> + <button.commit_callback + function="Pref.ClearCache" /> + </button> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="80" + name="Cache location" + top_pad="5" + width="300"> + Cache location: + </text> + <line_editor + control_name="CacheLocationTopFolder" + border_style="line" + border_thickness="1" + follows="left|top" + font="SansSerif" + height="23" + layout="topleft" + left="80" + max_length="4096" + name="cache_location" + top_pad="5" + width="205" /> + <button + follows="left|top" + height="23" + label="Browse" + label_selected="Browse" + layout="topleft" + left_pad="5" + name="set_cache" + top_delta="0" + width="100"> + <button.commit_callback + function="Pref.SetCache" /> + </button> + <button + follows="left|top" + height="23" + label="Default Location" + label_selected="Default Location" + layout="topleft" + left_pad="3" + name="default_cache_location" + top_delta="0" + width="100"> + <button.commit_callback + function="Pref.ResetCache" /> + </button> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="33" name="UI Size:" - top_pad="25" + top_pad="20" width="100"> UI size: </text> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index cdc462109c..ea09286592 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -180,14 +180,14 @@ increment="1" initial_value="23" label="Nearby chat toasts life time:" - label_width="190" + label_width="285" layout="topleft" left="45" max_val="60" min_val="1" name="nearby_toasts_lifetime" top_pad="10" - width="230" /> + width="325" /> <spinner control_name="NearbyToastFadingTime" decimal_digits="0" @@ -196,14 +196,14 @@ increment="1" initial_value="3" label="Nearby chat toasts fading time:" - label_width="190" + label_width="285" layout="topleft" left_delta="0" max_val="60" min_val="0" name="nearby_toasts_fadingtime" top_pad="3" - width="230" /> + width="325" /> <check_box control_name="TranslateChat" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 8a37822413..2b22f0d6e3 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -47,7 +47,7 @@ height="12" name="font_colors" top_pad="20" - width="120" + width="170" > Chat font colors: </text> @@ -208,6 +208,37 @@ </text> <color_swatch can_apply_immediately="true" + color="LtOrange" + follows="left|top" + height="24" + label_height="0" + layout="topleft" + left="360" + name="direct" + top_pad="-15" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="DirectChatColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="DirectChatColor" /> + </color_swatch> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_box10" + top_delta="5" + width="95"> + Direct + </text> + <color_swatch + can_apply_immediately="true" color="LtYellow" follows="left|top" height="24" @@ -275,7 +306,7 @@ height="12" name="bubble_chat" top_pad="20" - width="450" + width="495" > Name tag background color (also affects Bubble Chat): </text> @@ -320,7 +351,7 @@ height="12" name="floater_opacity" top_pad="15" - width="120" + width="200" > Floater Opacity: </text> 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 9ecab1a356..f7666bdc4c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -204,8 +204,7 @@ name="LocalLights" top_pad="1" width="256" /> - width="256" /> - <check_box + <check_box control_name="VertexShaderEnable" height="16" initial_value="true" @@ -724,7 +723,7 @@ follows="left|top" height="12" layout="topleft" - left="358" + left="407" left_pad="-30" name="TerrainDetailText" top="250" @@ -736,7 +735,7 @@ draw_border="false" height="38" layout="topleft" - left_delta="0" + left_delta="5" name="TerrainDetailRadio" top_pad="5" width="70"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index 04412bdb9c..1a8aae7f91 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -195,7 +195,7 @@ left="0" name="radio_teleport" top_delta="20" - width="100" /> + width="110" /> <radio_item height="16" label="Auto-pilot" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 901a1257e0..e639f0dc9d 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -93,98 +93,6 @@ name="connection_port" top_delta="3" width="170" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="80" - mouse_opaque="false" - name="cache_size_label_l" - top_pad="20" - width="200"> - Cache size - </text> - <slider - can_edit_text="true" - control_name="CacheSize" - decimal_digits="0" - follows="left|top" - height="15" - increment="16" - initial_value="512" - layout="topleft" - left_delta="150" - max_val="1024" - min_val="32" - name="cache_size" - top_delta="-2" - width="180" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_pad="6" - mouse_opaque="false" - name="text_box5" - top_delta="1" - width="40"> - MB - </text> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="80" - name="Cache location" - top_delta="20" - width="300"> - Cache location: - </text> - <line_editor - control_name="CacheLocationTopFolder" - border_style="line" - border_thickness="1" - follows="left|top" - font="SansSerif" - height="23" - layout="topleft" - left="80" - max_length="4096" - name="cache_location" - top_pad="5" - width="205" /> - <button - follows="left|top" - height="23" - label="Browse" - label_selected="Browse" - layout="topleft" - left_pad="5" - name="set_cache" - top_delta="-1" - width="100"> - <button.commit_callback - function="Pref.SetCache" /> - </button> - <button - follows="left|top" - height="23" - label="Reset" - label_selected="Reset" - layout="topleft" - left_pad="3" - name="reset_cache" - top_delta="0" - width="100"> - <button.commit_callback - function="Pref.ResetCache" /> - </button> <text type="string" @@ -360,7 +268,7 @@ height="23" layout="topleft" left_delta="50" - top_pad="5" + top_pad="5" name="updater_service_combobox" width="300"> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index e374c89f21..1f92244eb9 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -123,8 +123,8 @@ function="Pref.setControlFalse" parameter="MuteAmbient" /> </slider> - <button - control_name="MuteAmbient" + <button + control_name="MuteAmbient" disabled_control="MuteAudio" follows="top|left" height="16" @@ -157,7 +157,7 @@ function="Pref.setControlFalse" parameter="MuteSounds" /> </slider> - <button + <button control_name="MuteSounds" disabled_control="MuteAudio" follows="top|left" @@ -169,7 +169,10 @@ left_pad="5" name="mute_audio" tab_stop="false" - width="16" /> + width="16"> + <button.commit_callback + function="Pref.SetSounds"/> + </button> <slider control_name="AudioLevelMusic" disabled_control="MuteAudio" @@ -332,7 +335,17 @@ label="Play media attached to other avatars" left="25" width="230"/> - + <check_box + name="gesture_audio_play_btn" + control_name="EnableGestureSounds" + disabled_control="MuteAudio" + value="true" + follows="left|bottom|right" + height="15" + tool_tip="Check this to hear sounds from gestures" + label="Play sounds from gestures" + top_pad="1" + left="25"/> <text type="string" length="1" @@ -341,7 +354,7 @@ layout="topleft" left="25" name="voice_chat_settings" - width="180" + width="200" top_pad="7"> Voice Chat Settings </text> @@ -372,7 +385,7 @@ height="18" image_name="Move_Walk_Off" layout="topleft" - left_pad="170" + left_pad="170" name="avatar_icon" mouse_opaque="false" visible="true" @@ -483,8 +496,8 @@ filename="panel_sound_devices.xml" visiblity_control="ShowDeviceSettings" name="device_settings_panel" - top="314" - width="345" + top_pad="0" + width="480" left="18" class="panel_voice_device_settings"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index 2868d91cc7..4535c56339 100644 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml @@ -132,4 +132,12 @@ name="cancel_btn" top="700" width="90" /> + <web_browser + follows="all" + layout="topleft" + left="0" + name="login_media_panel" + width="1024" + height="768" + top="0"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml new file mode 100644 index 0000000000..aa38c49fae --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -0,0 +1,149 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + +<panel + border="true" + follows="top|left" + height="300" + label="Environment" + layout="topleft" + help_topic="panel_region_environment_tab" + name="panel_env_info" + width="530"> + <text + name="water_settings_title" + follows="top|left" + height="30" + layout="topleft" + left="50" + top_pad="20" + width="430" + wrap="true"> + Select the Water and Sky/Day Cycle Settings you would like all visitors to your region to see. More info + </text> + <view_border + bevel_style="none" + follows="top|left" + height="237" + layout="topleft" + left="50" + name="border" + top="60" + width="430"/> + <radio_group + follows="top|left" + height="45" + layout="topleft" + left_delta="10" + name="region_settings_radio_group" + top_delta="20" + width="200"> + <radio_item + label="Use Second Life default" + layout="topleft" + name="use_sl_default_settings"/> + <radio_item + label="Use the following settings" + layout="topleft" + name="use_my_settings" + top_pad="20"/> + </radio_group> + <panel + follows="top|left" + height="150" + layout="topleft" + left="50" + name="user_environment_settings" + top_pad="20" + width="430"> + <text + name="water_settings_title" + follows="top|left" + height="16" + layout="topleft" + left="50" + top_pad="0" + width="160"> + Water Setting + </text> + <combo_box + follows="top|left" + left_pad="2" + name="water_settings_preset_combo" + top_delta="-7" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + <text + name="sky_dayc_settings_title" + follows="top|left" + height="16" + layout="topleft" + left="50" + top_pad="30" + width="100"> + Sky / Day Cycle + </text> + <radio_group + layout="topleft" + left_delta="50" + name="sky_dayc_settings_radio_group" + top_pad="10" + height="50" + width="110"> + <radio_item + layout="topleft" + label="Fixed sky" + name="my_sky_settings"/> + <radio_item + layout="topleft" + label="Day cycle" + name="my_dayc_settings" + top_pad="25"/> + </radio_group> + <combo_box + follows="top|left" + left_pad="2" + name="sky_settings_preset_combo" + top_delta="-7" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + <combo_box + follows="top|left" + name="dayc_settings_preset_combo" + top_delta="36" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + </panel> + <button + follows="left|top" + height="23" + label="Apply" + layout="topleft" + right="-160" + name="apply_btn" + top_pad="10" + width="100" /> + <button + follows="left|top" + height="23" + label="Cancel" + layout="topleft" + left_pad="10" + name="cancel_btn" + width="100" /> + <loading_indicator + height="23" + left="50" + name="progress_indicator" + top_delta="0" + visible="false" + width="23" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index 1307d807e2..6b28639a77 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="false" + border="true" follows="top|left" height="510" help_topic="panel_region_estate_tab" @@ -20,7 +20,7 @@ name="estate_help_text" top="14" word_wrap="true" - width="300"> + > Changes to settings on this tab will affect all regions in the estate. </text> <text @@ -30,9 +30,10 @@ font="SansSerif" height="20" layout="topleft" - left_delta="0" + right="160" name="estate_text" top_pad="2" + halign="right" width="140"> Estate: </text> @@ -43,9 +44,9 @@ font="SansSerif" height="20" layout="topleft" - left_delta="0" + top_delta="0" name="estate_name" - top_delta="16" + left_pad="6" width="150"> (unknown) </text> @@ -56,9 +57,10 @@ font="SansSerif" height="20" layout="topleft" - left_delta="0" + right="160" name="owner_text" - top_pad="2" + top_pad="6" + halign="right" width="150"> Estate owner: </text> @@ -69,75 +71,68 @@ font="SansSerif" height="20" layout="topleft" - left_delta="0" + top_delta="0" name="estate_owner" - top_delta="16" + left_pad="6" use_ellipses="true" width="290"> (unknown) </text> + <view_border - bevel_style="in" + bevel_style="none" follows="top|left" - height="270" + height="95" layout="topleft" - left_delta="-4" + left="10" top_pad="5" - width="300" /> + width="470" /> + <check_box height="20" - label="Use Global Time" + label="Allow Public Access" layout="topleft" - left="12" - name="use_global_time_check" - top="132" + left="20" + name="externally_visible_check" + top_delta="5" width="200" /> + <check_box height="20" - label="Fixed Sun" - layout="topleft" - left="12" - name="fixed_sun_check" - top="152" - width="100" /> - <icon - height="20" - image_name="icon_day_cycle.tga" + label="Allow Voice Chat" layout="topleft" - left="47" - name="daycycle" - top="177" - width="165" /> - <slider - follows="left|top" - height="20" - increment="0.001" - label="Phase" - layout="topleft" - left="12" - max_val="30" - min_val="6" - name="sun_hour_slider" - show_text="false" - top="202" + left="280" + name="voice_chat_check" + top_delta="0" width="200" /> <check_box height="20" - label="Allow Public Access" + label="Allow Direct Teleport" layout="topleft" left_delta="0" - name="externally_visible_check" - top_pad="6" - width="200" /> + name="allow_direct_teleport" + top_pad="4" + width="80" /> + <button + enabled="false" + follows="left|top" + height="23" + label="Apply" + layout="topleft" + name="apply_btn" + top_pad="15" + left_delta="0" + width="97" /> + <text type="string" length="1" follows="top|left" height="16" layout="topleft" - left="32" + left="20" name="Only Allow" - top="250" + top_delta="-30" width="278"> Restrict Access to accounts verified by: </text> @@ -161,50 +156,6 @@ tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information." top_pad="2" width="278" /> - <check_box - height="20" - label="Allow Voice Chat" - layout="topleft" - left="12" - name="voice_chat_check" - top="304" - width="200" /> - <check_box - height="20" - label="Allow Direct Teleport" - layout="topleft" - left="12" - name="allow_direct_teleport" - top_pad="4" - width="80" /> - <button - enabled="false" - follows="left|top" - height="23" - label="Apply" - layout="topleft" - name="apply_btn" - top_pad="10" - left="110" - width="97" /> - <button - follows="left|top" - height="23" - label="Send Message To Estate..." - layout="topleft" - left="45" - name="message_estate_btn" - top_pad="20" - width="220" /> - <button - follows="left|top" - height="23" - label="Kick Resident from Estate..." - layout="topleft" - left="45" - name="kick_user_from_estate_btn" - top_pad="5" - width="220" /> <text type="string" @@ -214,16 +165,31 @@ height="20" layout="topleft" name="estate_manager_label" - right="520" + top_pad="30" + left="10" width="200"> Estate Managers: </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="280" + name="allow_resident_label" + top_delta="0" + width="200"> + Allowed Residents: + </text> + + <!-- Estate Managers box --> <view_border bevel_style="none" follows="top|left" height="71" layout="topleft" - right="520" + left="10" top_pad="-5" width="200" /> <name_list @@ -235,43 +201,15 @@ name="estate_manager_name_list" top_delta="0" width="200" /> - <button - follows="left|top" - height="23" - label="Remove..." - layout="topleft" - name="remove_estate_manager_btn" - right="520" - top_pad="5" - width="97" /> - <button - follows="left|top" - height="23" - label="Add..." - layout="topleft" - left_delta="-103" - name="add_estate_manager_btn" - top_delta="0" - width="97" /> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_delta="0" - name="allow_resident_label" - top_pad="10" - width="200"> - Allowed Residents: - </text> + + <!-- Allowed Residents box --> <view_border bevel_style="none" follows="top|left" height="71" layout="topleft" - right="520" - top_pad="-5" + left="280" + top_delta="0" width="200" /> <name_list follows="left|top" @@ -282,42 +220,78 @@ name="allowed_avatar_name_list" top_delta="0" width="200" /> + + <!-- Estate Managers buttons --> + <button + follows="left|top" + height="23" + label="Add..." + layout="topleft" + left="10" + name="add_estate_manager_btn" + top_pad="6" + width="97" /> <button follows="left|top" height="23" label="Remove..." layout="topleft" - name="remove_allowed_avatar_btn" - right="520" - top_pad="5" + name="remove_estate_manager_btn" + left_pad="6" width="97" /> + + <!-- Allowed Residents buttons --> <button follows="left|top" height="23" + left="280" label="Add..." layout="topleft" - left_delta="-103" name="add_allowed_avatar_btn" top_delta="0" width="97" /> + <button + follows="left|top" + height="23" + label="Remove..." + layout="topleft" + name="remove_allowed_avatar_btn" + left_pad="6" + top_delta="0" + width="97" /> + <text type="string" length="1" follows="left|top" height="20" layout="topleft" - left_delta="0" + left="10" name="allow_group_label" top_pad="10" width="200"> Allowed Groups: </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="280" + name="ban_resident_label" + top_delta="0" + width="200"> + Banned Residents: + </text> + + <!-- Allowed Groups box --> <view_border bevel_style="none" follows="top|left" height="71" layout="topleft" - right="520" + left="10" top_pad="-5" width="200" /> <name_list @@ -329,43 +303,15 @@ name="allowed_group_name_list" top_delta="0" width="200" /> - <button - follows="left|top" - height="23" - label="Remove..." - layout="topleft" - name="remove_allowed_group_btn" - right="520" - top_pad="5" - width="97" /> - <button - follows="left|top" - height="23" - label="Add..." - layout="topleft" - left_delta="-103" - name="add_allowed_group_btn" - top_delta="0" - width="97" /> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_delta="0" - name="ban_resident_label" - top_pad="10" - width="200"> - Banned Residents: - </text> + + <!-- Banned Residents box --> <view_border bevel_style="none" follows="top|left" height="71" layout="topleft" - right="520" - top_pad="-5" + left="280" + top_delta="0" width="200" /> <name_list follows="left|top" @@ -376,22 +322,64 @@ name="banned_avatar_name_list" top_delta="0" width="200" /> + + <!-- Allowed Groups buttons --> + <button + follows="left|top" + height="23" + label="Add..." + layout="topleft" + left="10" + name="add_allowed_group_btn" + top_pad="6" + width="97" /> <button follows="left|top" height="23" label="Remove..." layout="topleft" - name="remove_banned_avatar_btn" - right="520" - top_pad="5" + name="remove_allowed_group_btn" + left_pad="6" + top_delta="0" width="97" /> + + <!-- Banned Residents buttons --> <button follows="left|top" height="23" label="Add..." layout="topleft" - left_delta="-103" + left="280" name="add_banned_avatar_btn" top_delta="0" width="97" /> + <button + follows="left|top" + height="23" + label="Remove..." + layout="topleft" + name="remove_banned_avatar_btn" + top_delta="0" + left_pad="6" + width="97" /> + + <button + follows="left|top" + height="23" + label="Send Message To Estate..." + layout="topleft" + left="10" + name="message_estate_btn" + top_pad="20" + width="220" /> + <button + follows="left|top" + height="23" + label="Kick Resident from Estate..." + layout="topleft" + left="280" + name="kick_user_from_estate_btn" + top_delta="0" + width="220" /> + </panel> 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 e0d9f3f714..3f9195d092 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -134,6 +134,7 @@ top="190" width="80" /> <check_box + visible="FALSE" height="20" label="Allow Mesh Objects" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index d7a629e543..bbb8b40594 100644 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml @@ -2,7 +2,7 @@ <panel border="true" follows="top|left" - height="320" + height="460" help_topic="panel_region_terrain_tab" label="Terrain" layout="topleft" @@ -50,10 +50,10 @@ label="Terrain Raise Limit" label_width="120" layout="topleft" - left="15" + left="240" max_val="100" name="terrain_raise_spin" - top="60" + top="40" width="180" /> <spinner follows="left|top" @@ -62,129 +62,336 @@ label="Terrain Lower Limit" label_width="120" layout="topleft" - left="15" + left="240" max_val="0" min_val="-100" name="terrain_lower_spin" - top="80" + top="60" width="180" /> - <check_box + <view_border + bevel_style="none" + follows="top|left" + height="60" + layout="topleft" + left="8" + top="30" + width="460" /> + <text + type="string" + length="1" + follows="left|top" height="20" - label="Use Estate Sun" layout="topleft" - left="250" - name="use_estate_sun_check" - top="35" + left="10" + name="detail_texture_text" + top="110" + width="300"> + Terrain Textures (requires 512x512, 24 bit .tga files) + </text> + <texture_picker + follows="left|top" + height="100" + layout="topleft" + left_delta="0" + name="texture_detail_0" + top_delta="20" width="100" /> - <check_box - height="20" - label="Fixed Sun" + <texture_picker + follows="left|top" + height="100" + layout="topleft" + left_pad="10" + name="texture_detail_1" + top_delta="0" + width="100" /> + <texture_picker + follows="left|top" + height="100" layout="topleft" - left="250" - name="fixed_sun_check" - top="55" + left_pad="10" + name="texture_detail_2" + top_delta="0" + width="100" /> + <texture_picker + follows="left|top" + height="100" + layout="topleft" + left_pad="10" + name="texture_detail_3" + top_delta="0" width="100" /> - <icon + <text + type="string" + length="1" + follows="left|top" height="20" - image_name="icon_day_cycle.tga" layout="topleft" - left="285" - name="daycycle" - top="80" - width="165" /> - <slider + left="10" + name="height_text_lbl" + top_delta="90" + width="65"> + 1 (Low) + </text> + <text + type="string" + length="1" follows="left|top" height="20" - increment="0.001" - label="Phase" layout="topleft" - left="250" - max_val="30" - min_val="6" - name="sun_hour_slider" - show_text="false" - top="105" - width="200" /> - <button - enabled="false" + left_pad="45" + name="height_text_lbl2" + top_delta="0" + width="100"> + 2 + </text> + <text + type="string" + length="1" follows="left|top" height="20" - label="Apply" layout="topleft" - left="350" - name="apply_btn" - top="135" - width="90" /> - <combo_box - height="23" - layout="topleft" - left="50" - name="SkyPresetsCombo" - top="165" - width="150" /> - <combo_box - height="23" - layout="topleft" - left="200" - name="WaterPresetsCombo" - top="165" - width="150" /> - <button - enabled="false" + left_pad="10" + name="height_text_lbl3" + top_delta="0" + width="100"> + 3 + </text> + <text + type="string" + length="1" follows="left|top" height="20" - label="Apply" layout="topleft" - left="370" - name="wes_apply_btn" - top="165" - width="90" /> - <button - enabled="false" + left_pad="10" + name="height_text_lbl4" + top_delta="0" + width="100"> + 4 (High) + </text> + <text + type="string" + length="1" follows="left|top" height="20" - label="Edit Environment" layout="topleft" - left="370" - name="env_editor_btn" - top="195" - width="120" /> - <view_border - bevel_style="none" - follows="top|left" - height="130" + left="10" + name="height_text_lbl5" + top_delta="30" + width="300"> + Texture Elevation Ranges + </text> + <text + follows="left|top" + height="20" layout="topleft" - left="8" - top="30" - width="460" /> + left="10" + name="height_text_lbl10" + top_delta="30" + width="200" + word_wrap="true"> + These values represent the blend range for the textures above. + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left_delta="0" + name="height_text_lbl11" + top_delta="32" + width="200" + word_wrap="true"> + Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4. + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left="270" + name="height_text_lbl6" + top="250" + width="100"> + Northwest + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl7" + top_delta="0" + width="100"> + Northeast + </text> +<!-- northwest low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left="230" + max_val="500" + min_val="-500" + name="height_start_spin_1" + top_delta="15" + width="100" /> +<!-- northeast low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_start_spin_3" + top_delta="0" + width="100" /> +<!-- northwest high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left="230" + max_val="500" + min_val="-500" + name="height_range_spin_1" + top_delta="20" + width="100" /> +<!-- northeast high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_range_spin_3" + top_delta="0" + width="100" /> + <text + follows="left|top" + height="20" + layout="topleft" + left="270" + name="height_text_lbl8" + top_pad="10" + width="100"> + Southwest + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl9" + top_delta="0" + width="100"> + Southeast + </text> +<!-- southwest low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left="230" + max_val="500" + min_val="-500" + name="height_start_spin_0" + top_delta="15" + width="100" /> +<!-- southeast low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_start_spin_2" + top_delta="0" + width="100" /> +<!--southwest high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left="230" + max_val="500" + min_val="-500" + name="height_range_spin_0" + top_delta="20" + width="100" /> +<!-- southeast high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_range_spin_2" + top_delta="0" + width="100" /> +<!-- Terrain Download/Upload/Bake buttons --> <button follows="left|top" height="20" label="Download RAW terrain..." layout="topleft" - left_delta="2" + left="10" name="download_raw_btn" tool_tip="Available only to estate owners, not managers" - top_pad="60" - width="170" /> + top="390" + width="160" /> <button follows="left|top" height="20" label="Upload RAW terrain..." layout="topleft" - left="10" + left_pad="10" + top_delta="0" name="upload_raw_btn" tool_tip="Available only to estate owners, not managers" - top="243" - width="170" /> + width="160" /> <button follows="left|top" height="20" label="Bake Terrain" layout="topleft" - left="10" + left_pad="10" name="bake_terrain_btn" tool_tip="Set current terrain as mid-point for raise/lower limits" - top="283" + width="100" /> + <button + enabled="true" + follows="left|top" + height="20" + label="Apply" + layout="topleft" + left_delta="0" + name="apply_btn" + top="430" width="100" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml deleted file mode 100644 index 5d910ea659..0000000000 --- a/indra/newview/skins/default/xui/en/panel_region_texture.xml +++ /dev/null @@ -1,327 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - border="true" - follows="top|left" - height="320" - help_topic="panel_region_texture_tab" - label="Ground Textures" - layout="topleft" - left="0" - name="Textures" - top="320" - width="480"> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left="10" - name="region_text_lbl" - top="10" - width="100"> - Region: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left_delta="50" - name="region_text" - top_delta="0" - width="400"> - unknown - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left="10" - name="detail_texture_text" - top="36" - width="300"> - Terrain Textures (requires 512x512, 24 bit .tga files) - </text> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_delta="0" - name="texture_detail_0" - top_delta="20" - width="100" /> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_pad="10" - name="texture_detail_1" - top_delta="0" - width="100" /> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_pad="10" - name="texture_detail_2" - top_delta="0" - width="100" /> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_pad="10" - name="texture_detail_3" - top_delta="0" - width="100" /> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left="10" - name="height_text_lbl" - top="146" - width="65"> - 1 (Low) - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="45" - name="height_text_lbl2" - top_delta="0" - width="100"> - 2 - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl3" - top_delta="0" - width="100"> - 3 - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl4" - top_delta="0" - width="100"> - 4 (High) - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left="10" - name="height_text_lbl5" - top="170" - width="300"> - Texture Elevation Ranges - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left="51" - name="height_text_lbl6" - top="185" - width="100"> - Northwest - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl7" - top_delta="0" - width="100"> - Northeast - </text> -<!-- northwest low--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_start_spin_1" - top_delta="15" - width="100" /> -<!-- northeast low--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_start_spin_3" - top_delta="0" - width="100" /> -<!-- northwest high--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_range_spin_1" - top_delta="20" - width="100" /> -<!-- northeast high--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_range_spin_3" - top_delta="0" - width="100" /> - <text - follows="left|top" - height="20" - layout="topleft" - left="51" - name="height_text_lbl8" - top_pad="10" - width="100"> - Southwest - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl9" - top_delta="0" - width="100"> - Southeast - </text> -<!-- southwest low--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_start_spin_0" - top_delta="15" - width="100" /> -<!-- southeast low--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_start_spin_2" - top_delta="0" - width="100" /> -<!--southwest high--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_range_spin_0" - top_delta="20" - width="100" /> -<!-- southeast high--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_range_spin_2" - top_delta="0" - width="100" /> - <text - follows="left|top" - height="20" - layout="topleft" - left="10" - name="height_text_lbl10" - top_delta="30" - width="400" - word_wrap="true"> - These values represent the blend range for the textures above. - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_delta="0" - name="height_text_lbl11" - top_delta="32" - width="400" - word_wrap="true"> - Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4. - </text> - <button - enabled="false" - follows="left|bottom" - height="20" - label="Apply" - layout="topleft" - left="350" - name="apply_btn" - top="290" - width="100" /> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 6ef93406ec..0f330a7b98 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -142,6 +142,7 @@ mouse_opaque="false" background_visible="true" > + <badge location="top_left" location_percent_vcenter="50" location_percent_hcenter="95" /> <panel class="sidepanel_inventory" name="sidepanel_inventory" diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml index ccae7c5350..0a20a4a965 100644 --- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml @@ -7,33 +7,46 @@ layout="topleft" name="device_settings_panel" width="360"> - <panel.string - name="default_text"> - Default - </panel.string> - <icon - height="18" - image_name="Microphone_On" - left_delta="4" - name="microphone_icon" - mouse_opaque="false" - top="7" - layout="topleft" - visible="true" - width="18" /> - <text + <panel.string + name="default_text"> + Default + </panel.string> + <icon + follows="left|top" + height="18" + image_name="Microphone_On" + left_delta="-5" + name="microphone_icon" + mouse_opaque="false" + top="7" + layout="topleft" + visible="true" + width="18" /> + <icon + follows="left|top" + height="18" + image_name="Parcel_Voice_Dark" + layout="topleft" + left_pad="220" + name="speaker_icon" + mouse_opaque="false" + top_delta="0" + visible="true" + width="22" /> + <text type="string" length="1" - font.style="BOLD" + font.style="BOLD" follows="left|top" height="16" layout="topleft" - left_pad="3" + left_pad="-240" + top_delta="5" name="Input" - width="70"> - Input - </text> - <combo_box + width="60"> + Input + </text> + <combo_box height="23" control_name="VoiceInputAudioDevice" follows="left|top" @@ -42,33 +55,57 @@ max_chars="128" name="voice_input_device" top_delta="-5" - width="200" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left_delta="-70" - name="My volume label" - top_pad="4" - width="200"> - My volume: - </text> - <slider_bar - control_name="AudioLevelMic" - follows="top|right|left" - height="17" - increment="0.025" - initial_value="1.0" - layout="topleft" - left_delta="-6" - max_val="2" - name="mic_volume_slider" - tool_tip="Change the volume using this slider" - top_pad="-1" - width="220" /> - <text + width="150" /> + <text + font.style="BOLD" + type="string" + length="1" + follows="left|top" + height="15" + layout="topleft" + left_pad="30" + name="Output" + top_delta="5" + width="60"> + Output + </text> + <combo_box + control_name="VoiceOutputAudioDevice" + height="23" + follows="left|top" + layout="topleft" + left_pad="0" + max_chars="128" + name="voice_output_device" + top_delta="-4" + width="150" /> + <text + type="string" + halign="left" + length="1" + follows="left|top" + height="16" + layout="topleft" + left_delta="-300" + name="My volume label" + top_pad="14" + width="200"> + My volume: + </text> + <slider_bar + control_name="AudioLevelMic" + follows="top|right|left" + height="17" + increment="0.025" + initial_value="1.0" + layout="topleft" + left_delta="95" + max_val="2" + name="mic_volume_slider" + tool_tip="Change the volume using this slider" + top_pad="-18" + width="110" /> + <text type="string" text_color="EmphasisColor" length="1" @@ -79,8 +116,8 @@ name="wait_text" top_delta="-1" width="110"> - Please wait - </text> + Please wait + </text> <locate follows="right|top" height="20" @@ -121,35 +158,4 @@ name="bar4" top_delta="0" width="20" /> - <icon - height="18" - image_name="Parcel_Voice_Light" - left="5" - name="speaker_icon" - mouse_opaque="false" - top_pad="3" - visible="true" - width="22" /> - <text - font.style="BOLD" - type="string" - length="1" - follows="left|top" - height="15" - layout="topleft" - left_pad="0" - name="Output" - width="70"> - Output - </text> - <combo_box - control_name="VoiceOutputAudioDevice" - height="23" - follows="left|top" - layout="topleft" - left_pad="0" - max_chars="128" - name="voice_output_device" - top_delta="-3" - width="200" /> -</panel> +</panel>
\ No newline at end of file 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..79f29777ce 100644 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml @@ -88,6 +88,16 @@ visible="false" width="14" /> + <icon + follows="right|top" + height="13" + image_name="Parcel_SeeAVsOff_Light" + left="2" + name="see_avatars_icon" + top="3" + visible="false" + width="14" + /> <text follows="right|top" font="SansSerifSmall" diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 8997c1a6d7..79a0ec7c72 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -9,7 +9,7 @@ min_width="240" name="objects panel" width="333"> - <panel + <panel follows="all" layout="topleft" left="0" @@ -19,24 +19,226 @@ height="570" visible="true" width="330"> - <panel - class="panel_main_inventory" - filename="panel_main_inventory.xml" - follows="all" - layout="topleft" - left="0" - name="panel_main_inventory" - top="0" - label="" - height="545" - width="330" /> + <layout_stack + follows="left|right|top|bottom" + layout="topleft" + left="0" + top="0" + orientation="vertical" + name="inventory_layout_stack" + height="535" + width="330"> + <layout_panel + name="main_inventory_layout_panel" + min_dim="150" + width="330" + follows="bottom|left|right" + user_resize="false" + height="480"> + <panel + class="panel_main_inventory" + filename="panel_main_inventory.xml" + follows="all" + layout="topleft" + left="0" + name="panel_main_inventory" + top="0" + label="" + height="480" + width="330" /> + </layout_panel> + <layout_panel + width="330" + auto_resize="true" + user_resize="false" + follows="bottom|left|right" + name="inbox_layout_panel" + visible="false" + min_dim="35" + max_dim="200" + expanded_min_dim="90" + height="200"> + <panel + follows="all" + layout="topleft" + left="0" + name="marketplace_inbox" + class="panel_marketplace_inbox" + top="0" + label="" + height="200" + width="330"> + <string name="InboxLabelWithArg">Received Items ([NUM])</string> + <string name="InboxLabelNoArg">Received Items</string> + <button + label="Received Items" + name="inbox_btn" + height="35" + width="308" + image_unselected="MarketplaceBtn_Off" + image_selected="MarketplaceBtn_Selected" + halign="left" + handle_right_mouse="false" + follows="top|left|right" + is_toggle="true" + tab_stop="false" + pad_left="35" + top="0" + left="10" /> + <text + type="string" + length="1" + follows="right|top" + layout="topleft" + height="13" + top="10" + right="-20" + name="inbox_fresh_new_count" + font="SansSerifMedium" + halign="right" + text_color="EmphasisColor" + top_pad="0" + width="300"> + [NUM] New + </text> + <panel + follows="all" + left="10" + bottom="200" + width="308" + top="35" + bg_opaque_color="InventoryBackgroundColor" + background_visible="true" + background_opaque="true" + tool_tip="Drag and drop items to your inventory to manage and use them" + > + <text + name="inbox_inventory_placeholder" + type="string" + follows="all" + layout="topleft" + top="0" + left="0" + width="308" + height="165" + wrap="true" + halign="center"> + Purchases from the marketplace will be delivered here. + </text> + </panel> + </panel> + </layout_panel> + <layout_panel + width="330" + auto_resize="true" + user_resize="false" + follows="bottom|left|right" + name="outbox_layout_panel" + visible="false" + min_dim="35" + max_dim="200" + expanded_min_dim="90" + height="200"> + <panel + follows="all" + layout="topleft" + left="10" + name="marketplace_outbox" + class="panel_marketplace_outbox" + top="0" + label="" + height="200" + width="310"> + <button + label="Merchant Outbox" + is_toggle="true" + handle_right_mouse="false" + name="outbox_btn" + follows="top|left|right" + image_unselected="MarketplaceBtn_Off" + image_selected="MarketplaceBtn_Selected" + height="35" + tab_stop="false" + width="308" + halign="left" + pad_left="35" + top="0" + left="0" /> + <button + image_unselected="OutboxPush_Off" + image_selected="OutboxPush_Selected" + image_hover_selected="OutboxPush_Selected_Over" + image_hover_unselected="OutboxPush_Over" + image_disabled_selected="OutboxPush_Selected_Disabled" + image_disabled="OutboxPush_Disabled" + image_pressed="OutboxPush_Press" + image_pressed_selected="OutboxPush_Selected_Press" + label="" + tool_tip="Push to my Marketplace Storefront" + is_toggle="false" + name="outbox_sync_btn" + follows="top|right" + tab_stop="false" + halign="center" + top="6" + left="-50" + height="23" + width="32" + enabled="false" /> + <loading_indicator + follows="top|right" + name="outbox_sync_indicator" + top="6" + left="-50" + height="23" + width="32" + images_per_sec="1.15" + tab_stop="false" + visible="false"> + <images> + <image name="OutboxPush_Progress_1"/> + <image name="OutboxPush_Progress_2"/> + <image name="OutboxPush_Progress_3"/> + <image name="OutboxPush_Progress_4"/> + <image name="OutboxPush_Progress_5"/> + <image name="OutboxPush_Progress_6"/> + </images> + </loading_indicator> + <panel + follows="all" + left="10" + bottom="200" + width="308" + top="35" + bg_opaque_color="InventoryBackgroundColor" + background_visible="true" + background_opaque="true" + tool_tip="Drag and drop items here to prepare them for sale on your storefront" + > + <text + name="outbox_inventory_placeholder" + type="string" + follows="all" + layout="topleft" + top="0" + left="0" + width="308" + height="165" + wrap="true" + halign="center"> + Set up your merchant account to use this feature. + </text> + </panel> + </panel> + </layout_panel> + </layout_stack> <panel follows="bottom|left|right" - height="25" + height="30" layout="topleft" name="button_panel" left="9" - top_pad="-2" + top_pad="7" width="308"> <layout_stack follows="bottom|left|right" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2eb3cd7397..f4acb08255 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -18,6 +18,7 @@ <string name="StartupClearingCache">Clearing cache...</string> <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string> <string name="StartupInitializingVFS">Initializing VFS...</string> + <string name="StartupRequireDriverUpdate">Graphics Initialization Failed. Please Update Your Graphics Driver!</string> <!-- progress --> <string name="ProgressRestoring">Restoring...</string> @@ -43,6 +44,8 @@ <string name="LoginInitializingQuicktime">Initializing QuickTime...</string> <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string> <string name="LoginQuicktimeOK">QuickTime initialized successfully.</string> + <string name="LoginRequestSeedCapGrant">Requesting region capabilities...</string> + <string name="LoginRetrySeedCapGrant">Requesting region capabilities, attempt [NUMBER]...</string> <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string> <string name="LoginConnectingToRegion">Connecting to region...</string> <string name="LoginDownloadingClothing">Downloading clothing...</string> @@ -58,6 +61,83 @@ <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/</string> + <string name="LoginFailedViewerNotPermitted"> +The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer: +http://secondlife.com/download + +For more information, see our FAQ below: +http://secondlife.com/viewer-access-faq</string> + <string name="LoginIntermediateOptionalUpdateAvailable">Optional viewer update available: [VERSION]</string> + <string name="LoginFailedRequiredUpdate">Required viewer update: [VERSION]</string> + <string name="LoginFailedAlreadyLoggedIn">This agent is already logged in. +</string> + <string name="LoginFailedAuthenticationFailed">Sorry! We couldn't log you in. +Please check to make sure you entered the right + * Username (like bobsmith12 or steller.sunshine) + * Password +Also, please make sure your Caps Lock key is off.</string> + <string name="LoginFailedPasswordChanged">As a security precaution your password has been changed. +Please go to your account page at http://secondlife.com/password +and answer the security question to reset your password. +We are very sorry for the inconvenience.</string> + <string name="LoginFailedPasswordReset">We made some changes to our system and you will need to reset your password. +Please go to your account page at http://secondlife.com/password +and answer the security question to reset your password. +We are very sorry for the inconvenience.</string> + <string name="LoginFailedEmployeesOnly">Second Life is temporarily closed for maintenance. +Logins are currently restricted to employees only. +Check www.secondlife.com/status for updates.</string> + <string name="LoginFailedPremiumOnly">Second Life logins are temporarily restricted in order to make sure that those in-world have the best possible experience. + +People with free accounts will not be able to access Second Life during this time, to make room for those who have paid for Second Life.</string> + <string name="LoginFailedComputerProhibited">Second Life cannot be accessed from this computer. +If you feel this is an error, please contact +support@secondlife.com.</string> + <string name="LoginFailedAcountSuspended">Your account is not accessible until +[TIME] Pacific Time.</string> + <string name="LoginFailedAccountDisabled">We are unable to complete your request at this time. +Please contact Second Life support for assistance at http://secondlife.com/support. +If you are unable to change your password, please call (866) 476-9763.</string> + <string name="LoginFailedTransformError">Data inconsistency found during login. +Please contact support@secondlife.com.</string> + <string name="LoginFailedAccountMaintenance">Your account is undergoing minor maintenance. +Your account is not accessible until +[TIME] Pacific Time. +If you feel this is an error, please contact support@secondlife.com.</string> + <string name="LoginFailedPendingLogoutFault">Request for logout responded with a fault from simulator.</string> + <string name="LoginFailedPendingLogout">The system is logging you out right now. +Your Account will not be available until +[TIME] Pacific Time.</string> + <string name="LoginFailedUnableToCreateSession">Unable to create valid session.</string> + <string name="LoginFailedUnableToConnectToSimulator">Unable to connect to a simulator.</string> + <string name="LoginFailedRestrictedHours">Your account can only access Second Life +between [START] and [END] Pacific Time. +Please come back during those hours. +If you feel this is an error, please contact support@secondlife.com.</string> + <string name="LoginFailedIncorrectParameters">Incorrect parameters. +If you feel this is an error, please contact support@secondlife.com.</string> + <string name="LoginFailedFirstNameNotAlphanumeric">First name parameter must be alphanumeric. +If you feel this is an error, please contact support@secondlife.com.</string> + <string name="LoginFailedLastNameNotAlphanumeric">Last name parameter must be alphanumeric. +If you feel this is an error, please contact support@secondlife.com.</string> + <string name="LogoutFailedRegionGoingOffline">Region is going offline. +Please try logging in again in a minute.</string> + <string name="LogoutFailedAgentNotInRegion">Agent not in region. +Please try logging in again in a minute.</string> + <string name="LogoutFailedPendingLogin">The region was logging in another session. +Please try logging in again in a minute.</string> + <string name="LogoutFailedLoggingOut">The region was logging out the previous session. +Please try logging in again in a minute.</string> + <string name="LogoutFailedStillLoggingOut">The region is still logging out the previous session. +Please try logging in again in a minute.</string> + <string name="LogoutSucceeded">Region has logged out last session. +Please try logging in again in a minute.</string> + <string name="LogoutFailedLogoutBegun">Region has begun the logout process. +Please try logging in again in a minute.</string> + <string name="LoginFailedLoggingOutSession">The system has begun logging out your last session. +Please try logging in again in a minute.</string> + + <!-- Disconnection --> <string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string> <string name="SavingSettings">Saving your settings...</string> @@ -1682,10 +1762,10 @@ integer llGetParcelMaxPrims(vector pos, integer sim_wide) Returns the maximum number of prims allowed on the parcel at pos </string> <string name="LSLTipText_llGetParcelDetails" translate="false"> -list llGetParcelDetails(vector pos, list params) -Returns the parcel details specified in params for the parcel at pos. -Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA - </string> + list llGetParcelDetails(vector pos, list params) + Returns the parcel details specified in params for the parcel at pos. + Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS + </string> <string name="LSLTipText_llSetLinkPrimitiveParams" translate="false"> llSetLinkPrimitiveParams(integer linknumber, list rules) Sets primitive parameters for linknumber based on rules @@ -1831,6 +1911,15 @@ Requests single-word username of an avatar. When data is available the dataserv key llRequestDisplayName(key id) Requests name of an avatar. When data is available the dataserver event will be raised. </string> +<string name="LSLTipText_llRegionSayTo" translate="false"> +llRegionSayTo(key target, integer channel, string msg) +Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region +</string> +<string name="LSLTipText_llGetEnv" translate="false"> +llGetEnv(string name) +Returns a string with the requested data about the region +</string> + <!-- Avatar busy/away mode --> <string name="AvatarSetNotAway">Not Away</string> @@ -1935,6 +2024,8 @@ Requests name of an avatar. When data is available the dataserver event will be <string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string> <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string> <string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string> + <string name="InventoryInboxNoItems">Items purchased through the marketplace will be delivered here.</string> + <string name="InventoryOutboxNoItems">Drag items here in preparation for listing on your marketplace storefront.</string> <!-- use value="" because they have preceding spaces --> <string name="no_transfer" value=" (no transfer)" /> <string name="no_modify" value=" (no modify)" /> @@ -1981,7 +2072,6 @@ Requests name of an avatar. When data is available the dataserver event will be <!-- inventory folder --> <string name="InvFolder My Inventory">My Inventory</string> - <string name="InvFolder My Favorites">My Favorites</string> <string name="InvFolder Library">Library</string> <string name="InvFolder Textures">Textures</string> <string name="InvFolder Sounds">Sounds</string> @@ -2001,10 +2091,10 @@ Requests name of an avatar. When data is available the dataserver event will be <string name="InvFolder Uncompressed Sounds">Uncompressed Sounds</string> <string name="InvFolder Animations">Animations</string> <string name="InvFolder Gestures">Gestures</string> - <string name="InvFolder Favorite">Favorites</string> + <string name="InvFolder Favorite">My Favorites</string> <!-- historically default name of the Favorites folder can start from either "f" or "F" letter. We should localize both of them with the same value --> - <string name="InvFolder favorite">Favorites</string> + <string name="InvFolder favorite">My Favorites</string> <string name="InvFolder Current Outfit">Current Outfit</string> <string name="InvFolder Initial Outfits">Initial Outfits</string> <string name="InvFolder My Outfits">My Outfits</string> @@ -2015,6 +2105,8 @@ Requests name of an avatar. When data is available the dataserver event will be <string name="InvFolder Friends">Friends</string> <string name="InvFolder All">All</string> + <string name="no_attachments">No attachments worn</string> + <!-- inventory FVBridge --> <!-- This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale --> <string name="Buy">Buy</string> @@ -2162,6 +2254,9 @@ Requests name of an avatar. When data is available the dataserver event will be <string name="IMMainland">mainland</string> <string name="IMTeen">teen</string> + <!-- floater about land --> + <string name="Anyone">anyone</string> + <!-- floater region info --> <!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* --> <string name="RegionInfoError">error</string> @@ -2264,6 +2359,10 @@ Requests name of an avatar. When data is available the dataserver event will be <string name="GroupOwned">Group Owned</string> <string name="Public">Public</string> + <!-- Environment settings --> + <string name="LocalSettings">Local Settings</string> + <string name="RegionSettings">Region Settings</string> + <!-- panel classified --> <string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string> <string name="ClassifiedUpdateAfterPublish">(will update after publish)</string> @@ -3045,6 +3144,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="LocationCtrlAdultIconTooltip">Adult Region</string> <string name="LocationCtrlModerateIconTooltip">Moderate Region</string> <string name="LocationCtrlGeneralIconTooltip">General Region</string> + <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string> <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml new file mode 100644 index 0000000000..f77c4b7178 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/badge.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Additional attributes: + --> +<badge border_image="Badge_Border" + border_color="BadgeBorderColor" + font="SansSerifSmall" + image="Badge_Background" + image_color="BadgeImageColor" + label_color="BadgeLabelColor" + location="top_left" + location_percent_hcenter="85" + location_percent_vcenter="85" + padding_horiz="7" + padding_vert="4" + requests_front="true" + > +</badge> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 16241ed84e..302014eb24 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -25,5 +25,6 @@ pad_bottom="3" height="23" scale_image="true" + handle_right_mouse="true" use_draw_context_alpha="true"> </button> diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml new file mode 100644 index 0000000000..2c987b158d --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inbox_folder_view_folder + folder_arrow_image="Folder_Arrow" + folder_indentation="8" + item_height="20" + item_top_pad="4" + selection_image="Rounded_Square" + > + <new_badge label="New" location="right" location_percent_hcenter="70" /> +</inbox_folder_view_folder> diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml new file mode 100644 index 0000000000..830c27bdac --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inbox_inventory_panel show_load_status="false" /> diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml index 93875d66e6..00f4c43915 100644 --- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml @@ -3,4 +3,12 @@ bg_opaque_color="InventoryBackgroundColor" background_visible="true" background_opaque="true" - /> + show_load_status="true" + > + <scroll + name="Inventory Scroller" + follows="all" + reserve_scroll_corner="true" + tab_stop="true" + /> +</panel> diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 37d60f1671..44436fb6f2 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -123,6 +123,14 @@ font="SansSerifSmall" text_color="TextFgColor" /> + <see_avatars_icon + name="see_avatars_icon" + width="22" + height="18" + top="21" + follows="right|top" + image_name="Parcel_SeeAVsOff_Light" + /> <combo_button name="Location History" label="" diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml index 9bf99fa363..47a210d9b7 100644 --- a/indra/newview/skins/default/xui/en/widgets/panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel.xml @@ -10,4 +10,5 @@ bg_alpha_image_overlay="White" background_visible="false" background_opaque="false" - chrome="false"/>
\ No newline at end of file + chrome="false" + accepts_badge="true"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/time.xml b/indra/newview/skins/default/xui/en/widgets/time.xml new file mode 100644 index 0000000000..b5bdd564a6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/time.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<time text_enabled_color="LabelTextColor" + text_disabled_color="LabelDisabledColor" + font="SansSerifSmall" + label_width="40" > + <time.up_button name="SpinCtrl Up" + image_unselected="Stepper_Up_Off" + image_selected="Stepper_Up_Press" + tab_stop="false" + follows="left|bottom" /> + <time.down_button name="SpinCtrl Down" + image_unselected="Stepper_Down_Off" + image_selected="Stepper_Down_Press" + tab_stop="false" + follows="left|bottom" /> +</time> |