diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
78 files changed, 3221 insertions, 998 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 1f366f6c52..072fafd06e 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1560,7 +1560,7 @@ Only large parcels can be listed in search. layout="topleft" left_pad="5" name="Clear" - tool_tip="Clear the landing point." + tool_tip="Clear the landing point" top_delta="0" width="50" /> <text @@ -1580,7 +1580,7 @@ Only large parcels can be listed in search. layout="topleft" left_delta="116" name="landing type" - tool_tip="Teleport Routing -- select how to handle teleports onto your land." + tool_tip="Teleport Routing -- select how to handle teleports onto your land" top_delta="0" width="120"> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index 3a2337bfff..a6a6e0ec22 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -196,7 +196,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left="10" max_val="4" name="priority" - tool_tip="Controls which other animations can be overridden by this animation." + tool_tip="Controls which other animations can be overridden by this animation" width="160" /> <check_box top_pad="0" @@ -206,7 +206,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left="10" width="100" name="loop_check" - tool_tip="Makes this animation loop." /> + tool_tip="Makes this animation loop" /> <spinner follows="left|top" height="23" @@ -219,7 +219,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left="30" max_val="100" name="loop_in_point" - tool_tip="Sets point in animation that looping returns to." + tool_tip="Sets point in animation that looping returns to" width="110" /> <spinner bottom_delta="0" @@ -232,7 +232,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left_pad="10" max_val="100" name="loop_out_point" - tool_tip="Sets point in animation that ends a loop." + tool_tip="Sets point in animation that ends a loop" label_width="45" width="120" /> <text @@ -252,7 +252,7 @@ Maximum animation length is [MAX_LENGTH] seconds. layout="topleft" left_pad="0" name="hand_pose_combo" - tool_tip="Controls what hands do during animation." + tool_tip="Controls what hands do during animation" width="150"> <combo_box.item label="Spread" @@ -325,7 +325,7 @@ Maximum animation length is [MAX_LENGTH] seconds. layout="topleft" left_pad="0" name="emote_combo" - tool_tip="Controls what face does during animation."> + tool_tip="Controls what face does during animation"> <combo_box.item label="(None)" name="[None]" /> @@ -405,7 +405,7 @@ Maximum animation length is [MAX_LENGTH] seconds. layout="topleft" left_pad="0" name="preview_base_anim" - tool_tip="Use this to test your animation behavior while your avatar performs common actions."> + tool_tip="Use this to test your animation behavior while your avatar performs common actions"> <combo_box.item label="Standing" name="Standing" /> @@ -430,7 +430,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left="10" max_val="10" name="ease_in_time" - tool_tip="Amount of time (in seconds) over which animations blends in." + tool_tip="Amount of time (in seconds) over which animations blends in" top_pad="10" width="200" /> <spinner @@ -444,7 +444,7 @@ Maximum animation length is [MAX_LENGTH] seconds. top_pad="0" max_val="10" name="ease_out_time" - tool_tip="Amount of time (in seconds) over which animations blends out." + tool_tip="Amount of time (in seconds) over which animations blends out" width="200" /> <button follows="top|right" @@ -455,7 +455,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left="10" name="play_btn" picture_style="true" - tool_tip="Play/pause your animation." + tool_tip="Play/pause your animation" top_pad="0" width="28" /> <button diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index 09b1735e04..a60064fb37 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -53,7 +53,7 @@ height="16" layout="topleft" left="20" - tool_tip="Beacon Width" + tool_tip="Beacon width" name="beacon_width_label" top_pad="3" width="128"> 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 42a063928c..3e6845cfa5 100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml @@ -61,7 +61,7 @@ height="16" layout="topleft" left="10" - tool_tip="Grid Opacity" + tool_tip="Grid opacity" name="grid_opacity_label" top_pad="5" width="128"> 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 041cd2a118..5bab421adf 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -28,7 +28,7 @@ layout="topleft" left="20" height="30" - top="30" + top="25" width="300" name="info_need_more"> You need more L$ @@ -53,7 +53,7 @@ layout="topleft" left="20" height="30" - top="30" + top="25" width="200" name="info_buying"> Buy L$ @@ -67,7 +67,7 @@ layout="topleft" left="20" name="balance_label" - top="70" + top="65" width="210"> I have </text> @@ -91,7 +91,7 @@ follows="top|left" font="SansSerifMedium" height="16" - top="100" + top="95" layout="topleft" left="20" name="currency_action" @@ -133,7 +133,7 @@ height="16" layout="topleft" left="20" - top="130" + top="125" name="buying_label" width="210"> For the price @@ -148,10 +148,10 @@ height="16" top_delta="0" layout="topleft" - left="170" + left="150" name="currency_est" - width="150"> - [LOCALAMOUNT] + width="170"> + approx. [LOCALAMOUNT] </text> <text type="string" @@ -161,7 +161,7 @@ follows="top|left" height="16" layout="topleft" - top="130" + top="125" left="170" width="150" halign="right" @@ -171,11 +171,11 @@ <text type="string" font="SansSerifSmall" - top="150" + top="145" length="1" follows="top|left" - halign="right" height="16" + halign="right" left="150" width="170" layout="topleft" @@ -191,7 +191,7 @@ layout="topleft" left="20" name="total_label" - top="170" + top="165" width="210"> My new balance will be </text> @@ -212,28 +212,58 @@ <text type="string" length="1" + text_color="0.7 0.7 0.7 0.5" + follows="top|left" + layout="topleft" + halign="right" + top="189" + left="20" + width="300" + height="30" + name="currency_links"> + [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com exchange rate] + </text> + <text + type="string" + length="1" + text_color="0.7 0.7 0.7 0.5" follows="top|left" layout="topleft" - top="195" + halign="right" + top="202" left="20" width="300" height="30" + name="exchange_rate_note"> +Re-enter amount to see the latest exchange rate. + </text> + <text + type="string" + length="1" + text_color="0.7 0.7 0.7 0.5" + follows="top|left" + layout="topleft" + halign="right" + top="213" + left="10" + width="310" + height="30" name="purchase_warning_repurchase"> - Confirming this purchase only buys the L$. -You'll need to try again. + Confirming this purchase only buys L$, not the object. </text> <text type="string" length="1" + text_color="0.7 0.7 0.7 0.5" follows="top|left" layout="topleft" - top="195" + halign="right" + top="213" left="20" width="300" height="30" name="purchase_warning_notenough"> - You aren't buying enough L$. -Increase the amount to buy. + You aren't buying enough L$. Increase the amount. </text> <button diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 86c75a3946..a5c73a7ca4 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -45,7 +45,7 @@ quadrant="left" scale_image="false" sound_flags="3" - tool_tip="Orbit Camera Around Focus" + tool_tip="Orbit camera around focus" top="15" width="64" /> <joystick_track @@ -60,7 +60,7 @@ quadrant="left" scale_image="false" sound_flags="3" - tool_tip="Move Camera Up and Down, Left and Right" + tool_tip="Move camera up and down, left and right" top="15" visible="false" width="64" /> @@ -77,7 +77,7 @@ quadrant="left" scale_image="false" sound_flags="3" - tool_tip="Zoom Camera Towards Focus" + tool_tip="Zoom camera toward focus" top_delta="0" width="16" /> </panel> @@ -99,7 +99,7 @@ image_selected="PushButton_Selected_Press" name="orbit_btn" tab_stop="false" - tool_tip="Orbit Camera" + tool_tip="Orbit camera" value="true" width="25"> </button> @@ -113,7 +113,7 @@ image_selected="PushButton_Selected_Press" name="pan_btn" tab_stop="false" - tool_tip="Pan Camera" + tool_tip="Pan camera" width="25"> </button> <button @@ -125,7 +125,7 @@ image_selected="PushButton_Selected_Press" name="avatarview_btn" tab_stop="false" - tool_tip="See as Avatar" + tool_tip="See as avatar" width="25"> </button> <button @@ -138,7 +138,7 @@ image_selected="PushButton_Selected_Press" name="freecamera_btn" tab_stop="false" - tool_tip="View Object" + tool_tip="View object" width="25"> </button> diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index 3b6d5452e3..70468e7474 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -1039,7 +1039,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -1156,21 +1156,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" @@ -1260,7 +1245,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -1377,21 +1362,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" @@ -1524,21 +1494,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" @@ -1600,7 +1555,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -1745,21 +1700,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" @@ -1821,7 +1761,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -1966,21 +1906,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" @@ -2054,7 +1979,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -2199,21 +2124,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" @@ -2275,7 +2185,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -2420,21 +2330,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" @@ -2496,7 +2391,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -2641,21 +2536,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" @@ -2717,7 +2597,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -2862,21 +2742,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" @@ -2938,7 +2803,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -3083,21 +2948,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" @@ -3385,21 +3235,6 @@ scratch and wear it. width="373"> Located in [PATH] </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml index 5e87e065a4..cecd6c4ef7 100644 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml @@ -105,7 +105,7 @@ layout="topleft" left="390" name="EnvWaterColor" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="30" width="40" /> <text diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index 3d0a969112..7346c81e79 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -59,7 +59,7 @@ <button follows="bottom|left" font="SansSerifBigBold" - tool_tip="Change sort and view of Recent Residents list" + tool_tip="Change sort and view of recent residents list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -81,7 +81,7 @@ left_pad="5" name="new_gesture_btn" picture_style="true" - tool_tip="Make new Gesture" + tool_tip="Make new gesture" top_delta="0" width="18" /> <button @@ -95,7 +95,7 @@ left_pad="230" name="del_btn" picture_style="true" - tool_tip="Delete this Gesture" + tool_tip="Delete this gesture" top_delta="0" width="18" /> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index 53d05f3c61..02754b25dd 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -98,7 +98,7 @@ layout="topleft" left="10" name="check prelude" - tool_tip="Set this to make the region a prelude." + tool_tip="Set this to make the region a prelude" top_pad="10" width="180"> <check_box.commit_callback @@ -110,7 +110,7 @@ layout="topleft" left_delta="0" name="check fixed sun" - tool_tip="Fix the sun position (like in Region/Estate > Terrain." + tool_tip="Fix the sun position (like in Region/Estate > Terrain" top_pad="4" width="180"> <check_box.commit_callback @@ -134,7 +134,7 @@ layout="topleft" left_delta="0" name="check visible" - tool_tip="Set this to make the region visible to non-gods." + tool_tip="Set this to make the region visible to non-gods" top_pad="4" width="180"> <check_box.commit_callback @@ -146,7 +146,7 @@ layout="topleft" left_delta="0" name="check damage" - tool_tip="Set this to enable damage in this region." + tool_tip="Set this to enable damage in this region" top_pad="4" width="180"> <check_box.commit_callback @@ -158,7 +158,7 @@ layout="topleft" left_delta="0" name="block dwell" - tool_tip="Set this to make the region not compute traffic." + tool_tip="Set this to make the region not compute traffic" top_pad="4" width="180"> <check_box.commit_callback @@ -182,7 +182,7 @@ layout="topleft" left_delta="0" name="is sandbox" - tool_tip="Toggle whether this is a sandbox region." + tool_tip="Toggle whether this is a sandbox region" top_pad="4" width="180"> <check_box.commit_callback @@ -197,7 +197,7 @@ layout="topleft" left="12" name="Bake Terrain" - tool_tip="Save the current terrain as default." + tool_tip="Save the current terrain as default" top_pad="32" width="110"> <button.commit_callback @@ -211,7 +211,7 @@ label_selected="Revert Terrain" layout="topleft" name="Revert Terrain" - tool_tip="Replace the current terrain with default." + tool_tip="Replace the current terrain with default" top_pad="10" width="110"> <button.commit_callback @@ -225,7 +225,7 @@ label_selected="Swap Terrain" layout="topleft" name="Swap Terrain" - tool_tip="Swap current terrain with default." + tool_tip="Swap current terrain with default" top_pad="10" width="110"> <button.commit_callback @@ -425,7 +425,7 @@ layout="topleft" left="278" name="Refresh" - tool_tip="Click here to refresh the above information." + tool_tip="Click here to refresh the above information" top_pad="10" width="110"> <button.commit_callback @@ -440,7 +440,7 @@ layout="topleft" left="278" name="Apply" - tool_tip="Click here to apply any changes from above." + tool_tip="Click here to apply any changes from above" top="317" width="110"> <button.commit_callback @@ -455,7 +455,7 @@ layout="topleft" left="130" name="Select Region" - tool_tip="Select the whole region with the land tool." + tool_tip="Select the whole region with the land tool" top="238" width="110"> <button.commit_callback @@ -470,7 +470,7 @@ layout="topleft" left_delta="0" name="Autosave now" - tool_tip="Save gzipped state to autosave directory." + tool_tip="Save gzipped state to autosave directory" top_pad="10" width="110"> <button.commit_callback @@ -562,7 +562,7 @@ layout="topleft" left="278" name="Apply" - tool_tip="Click here to apply any changes from above." + tool_tip="Click here to apply any changes from above" top="54" width="110"> <button.commit_callback @@ -577,7 +577,7 @@ layout="topleft" left="8" name="Set Target" - tool_tip="Set the target avatar for object deletion." + tool_tip="Set the target avatar for object deletion" top="78" width="110"> <button.commit_callback @@ -649,7 +649,7 @@ layout="topleft" left="12" name="Get Top Colliders" - tool_tip="Gets list of objects experiencing the most narrowphase callbacks." + tool_tip="Gets list of objects experiencing the most narrowphase callbacks" top_pad="20" width="130"> <button.commit_callback @@ -664,7 +664,7 @@ layout="topleft" left_delta="0" name="Get Top Scripts" - tool_tip="Gets list of objects spending the most time running scripts." + tool_tip="Gets list of objects spending the most time running scripts" top_pad="5" width="130"> <button.commit_callback @@ -679,7 +679,7 @@ layout="topleft" left_delta="0" name="Scripts digest" - tool_tip="Gets a list of all scripts and number of occurences of each." + tool_tip="Gets a list of all scripts and number of occurences of each" top_pad="5" width="130" > <button.commit_callback 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 c695753ca3..fe04d1f627 100644 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -132,7 +132,7 @@ left="10" max_val="4096" name="GrapicsCardTextureMemory" - tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry." + tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry." top_pad="10" width="300" /> <spinner diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml index 2a431edcdd..2966b47232 100644 --- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml @@ -202,7 +202,7 @@ Client </text> <text - visiblity_control="LagMeterShrunk" + invisiblity_control="LagMeterShrunk" type="string" length="1" bottom="40" @@ -216,7 +216,7 @@ Normal </text> <text - visiblity_control="LagMeterShrunk" + invisiblity_control="LagMeterShrunk" bottom="56" follows="left|top" height="16" @@ -251,7 +251,7 @@ Network </text> <text - visiblity_control="LagMeterShrunk" + invisiblity_control="LagMeterShrunk" type="string" length="1" bottom="80" @@ -265,7 +265,7 @@ Normal </text> <text - visiblity_control="LagMeterShrunk" + invisiblity_control="LagMeterShrunk" bottom="96" follows="left|top" height="16" @@ -300,7 +300,7 @@ Server </text> <text - visiblity_control="LagMeterShrunk" + invisiblity_control="LagMeterShrunk" type="string" length="1" bottom="120" @@ -314,7 +314,7 @@ Normal </text> <text - visiblity_control="LagMeterShrunk" + invisiblity_control="LagMeterShrunk" bottom="136" follows="left|top" height="16" @@ -338,6 +338,7 @@ layout="topleft" left="10" name="minimize" + tool_tip="Toggle floater size" top_delta="4" width="40"> <button.commit_callback diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index f887b48ed0..dbafa56035 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -58,7 +58,7 @@ layout="topleft" left_pad="4" name="Show on Map" - tool_tip="Show this land on the world map." + tool_tip="Show this land on the world map" top_delta="0" width="100" /> <text diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index f82e01dd1f..745385f153 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -57,7 +57,7 @@ name="turn left btn" picture_style="true" scale_image="false" - tool_tip="Turn Left (press Left Arrow or A)" + tool_tip="Turn left (press Left Arrow or A)" top="45" width="25" /> <button @@ -71,7 +71,7 @@ name="turn right btn" picture_style="true" scale_image="false" - tool_tip="Turn Right (press Right Arrow or D)" + tool_tip="Turn right (press Right Arrow or D)" top_delta="0" width="25" /> <button @@ -85,7 +85,7 @@ name="move up btn" picture_style="true" scale_image="false" - tool_tip="Fly Up, Press "E"" + tool_tip="Fly up, press "E"" top="14" width="25" /> <button @@ -99,7 +99,7 @@ name="move down btn" picture_style="true" scale_image="false" - tool_tip="Fly Down, Press "C"" + tool_tip="Fly down, press "C"" top_delta="0" width="20" /> <joystick_turn @@ -114,7 +114,7 @@ picture_style="true" quadrant="up" scale_image="false" - tool_tip="Walk Forward (press Up Arrow or W)" + tool_tip="Walk forward (press up arrow or W)" top_delta="10" width="21" /> <joystick_turn @@ -129,7 +129,7 @@ picture_style="true" quadrant="down" scale_image="false" - tool_tip="Walk Backward (press Down Arrow or S)" + tool_tip="Walk backward (press down arrow or S)" top_delta="30" width="21" /> </panel> @@ -152,7 +152,7 @@ name="mode_walk_btn" left="10" pad_right="0" - tool_tip="Walking Mode" + tool_tip="Walking mode" top="2" width="31" /> <button @@ -167,7 +167,7 @@ name="mode_run_btn" pad_left="0" pad_right="0" - tool_tip="Running Mode" + tool_tip="Running mode" top="2" width="31" /> <button @@ -181,7 +181,7 @@ name="mode_fly_btn" pad_left="0" pad_right="0" - tool_tip="Flying Mode" + tool_tip="Flying mode" top="2" width="31" /> <button @@ -192,7 +192,7 @@ layout="topleft" left="0" name="stop_fly_btn" - tool_tip="Stop Flying" + tool_tip="Stop flying" top="2" width="115" /> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index f1976afb4a..6fbfed5f60 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -30,23 +30,18 @@ color="1 1 1 1" enabled="true" image_name="closebox.tga" name="close_btn"/> </panel> - <text_editor + <chat_history allow_html="true" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" - follows="left|top|right|bottom" + follows="left|top|right" font="SansSerif" layout="topleft" - height="320" - max_length="2147483647" - name="Chat History Editor" + height="320" + name="chat_history" parse_highlights="true" - read_only="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" - bottom="0" - track_bottom="true" - width="250" - word_wrap="true" /> + width="250"/> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml index 5756f9590e..e34b87dbba 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml @@ -43,7 +43,7 @@ layout="topleft" left="10" name="Anim play btn" - tool_tip="Play this animation so that others can see it." + tool_tip="Play this animation so that others can see it" top="47" width="125" /> <button @@ -54,7 +54,7 @@ layout="topleft" left_pad="5" name="Anim audition btn" - tool_tip="Play this animation so that only you can see it." + tool_tip="Play this animation so that only you can see it" top_delta="0" width="125" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml index 4220655a6f..7a868a1fe9 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml @@ -44,7 +44,7 @@ sound_flags="0" top="55" left="10" - tool_tip="Play this sound so that others can hear it." + tool_tip="Play this sound so that others can hear it" width="125" /> <button follows="left|top" @@ -55,7 +55,7 @@ layout="topleft" name="Sound audition btn" sound_flags="0" - tool_tip="Play this sound so that only you can hear it." + tool_tip="Play this sound so that only you can hear it" left_pad="10" width="125" /> diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index e477b6ddb8..32f71da61a 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -108,10 +108,10 @@ <combo_item name="Unconstrained" value="Unconstrained"> Unconstrained </combo_item> - <combo_item name="1:1" value="1:1" tool_tip="Group Insignia or 1st Life Profile"> + <combo_item name="1:1" value="1:1" tool_tip="Group insignia or 1st Life profile"> 1:1 </combo_item> - <combo_item name="4:3" value="4:3" tool_tip="2nd Life Profile"> + <combo_item name="4:3" value="4:3" tool_tip="2nd Life profile"> 4:3 </combo_item> <combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks"> @@ -123,7 +123,7 @@ <combo_item name="16:10" value="16:10"> 16:10 </combo_item> - <combo_item name="16:9" value="16:9" tool_tip="Profile Picks"> + <combo_item name="16:9" value="16:9" tool_tip="Profile picks"> 16:9 </combo_item> <combo_item name="2:1" value="2:1"> diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml new file mode 100644 index 0000000000..4ac0edca5a --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="true" + height="400" + layout="topleft" + min_height="140" + min_width="467" + name="floater_search" + help_topic="floater_search" + save_rect="true" + single_instance="true" + title="Search [SECOND_LIFE]" + width="620"> + <floater.string + name="search_url"> + http://eniac21.lindenlab.com:10001/viewer/search/ + </floater.string> + <floater.string + name="loading_text"> + Loading... + </floater.string> + <floater.string + name="done_text"> + Done + </floater.string> + <layout_stack + bottom="400" + follows="left|right|top|bottom" + layout="topleft" + left="10" + name="stack1" + top="20" + width="600"> + <layout_panel + height="12" + layout="topleft" + left_delta="0" + name="external_controls" + top_delta="0" + user_resize="false" + width="570"> + <web_browser + bottom="-10" + follows="left|right|top|bottom" + layout="topleft" + left="0" + name="browser" + top="0" + width="570" /> + <text + follows="bottom|left" + height="16" + layout="topleft" + left_delta="0" + name="status_text" + top_pad="4" + width="150" /> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index bd1484c0fe..551f570b52 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -125,7 +125,7 @@ layout="topleft" left="10" name="more_btn" - tool_tip="Advanced Options" + tool_tip="Advanced options" top="270" width="80" /> <button @@ -136,7 +136,7 @@ layout="topleft" left_delta="0" name="less_btn" - tool_tip="Advanced Options" + tool_tip="Advanced options" top_delta="0" width="80" /> <text diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml index 2011f57d8b..126bca2074 100644 --- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml @@ -93,7 +93,9 @@ top_pad="10" left_delta="0" height="20" - width="100"/> + width="100" + commit_callback.function="ShowGroupInspector" + commit_callback.parameter="" /> <button name="place_btn" label="Place" @@ -112,13 +114,35 @@ follows="left|top" font="SansSerif" height="20" - layout="topleft" left="0" max_length="65536" name="slurl" top_pad="4" - width="100"> + width="150"> secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect </text> + <text + follows="left|top" + font="SansSerif" + height="20" + left="0" + max_length="65536" + name="slurl_group" + top_pad="4" + width="150"> + secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect + </text> + + <text + follows="left|top" + font="SansSerif" + height="20" + left="0" + max_length="65536" + name="slurl_group_about" + top_pad="4" + width="150"> + secondlife:///app/group/00000000-0000-0000-0000-000000000000/about + </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index d3ceb67ceb..b898fd7c93 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -87,7 +87,7 @@ image_selected="Tool_Grab" image_unselected="Tool_Grab" layout="topleft" - left_pad="8" + left_pad="20" name="button move" picture_style="true" tool_tip="Move" @@ -104,7 +104,7 @@ image_selected="Tool_Face" image_unselected="Tool_Face" layout="topleft" - left_pad="8" + left_pad="20" name="button edit" picture_style="true" tool_tip="Edit" @@ -121,7 +121,7 @@ image_selected="Tool_Create" image_unselected="Tool_Create" layout="topleft" - left_pad="8" + left_pad="20" name="button create" picture_style="true" tool_tip="Create" @@ -138,7 +138,7 @@ image_selected="Tool_Dozer" image_unselected="Tool_Dozer" layout="topleft" - left_pad="8" + left_pad="20" name="button land" picture_style="true" tool_tip="Land" @@ -207,71 +207,71 @@ layout="topleft" name="move_radio_group"> <radio_item - top_pad="6" + top_pad="6" label="Move" layout="topleft" name="radio move" /> <radio_item - top_pad="6" + top_pad="6" label="Lift (Ctrl)" layout="topleft" name="radio lift" /> <radio_item - top_pad="6" + top_pad="6" label="Spin (Ctrl+Shift)" layout="topleft" name="radio spin" /> <radio_group.commit_callback - function="BuildTool.commitRadioMove"/> - </radio_group> - <radio_group + function="BuildTool.commitRadioMove"/> + </radio_group> + <radio_group follows="left|top" - left="10" - top="54" - height="70" + left="10" + top="54" + height="70" layout="topleft" - name="edit_radio_group"> + name="edit_radio_group"> <radio_item - label="Move" - layout="topleft" - name="radio position" /> + label="Move" + layout="topleft" + name="radio position" /> <radio_item - top_pad="6" + top_pad="6" label="Rotate (Ctrl)" layout="topleft" name="radio rotate" /> <radio_item - top_pad="6" + top_pad="6" label="Stretch (Ctrl+Shift)" layout="topleft" name="radio stretch" /> <radio_item - top_pad="6" + top_pad="6" label="Select Texture" layout="topleft" name="radio select face" /> - <radio_group.commit_callback - function="BuildTool.commitRadioEdit"/> + <radio_group.commit_callback + function="BuildTool.commitRadioEdit"/> </radio_group> <check_box left="10" follows="left|top" height="16" - control_name="EditLinkedParts" + control_name="EditLinkedParts" label="Edit linked" layout="topleft" name="checkbox edit linked parts" > <check_box.commit_callback - function="BuildTool.selectComponent"/> + function="BuildTool.selectComponent"/> </check_box> - <check_box + <check_box control_name="ScaleUniform" height="19" label="Stretch Both Sides" layout="topleft" left="143" name="checkbox uniform" - top="50" + top="50" width="134" /> <check_box control_name="ScaleStretchTextures" @@ -292,10 +292,9 @@ name="checkbox snap to grid" width="134" /> <combo_box - height="20" + height="19" layout="topleft" follows="left|top" - top_pad="4" name="combobox grid mode" width="108"> <combo_box.item @@ -313,9 +312,8 @@ <combo_box.commit_callback function="BuildTool.gridMode"/> </combo_box> - <button + <button left_pad="0" - right="-12" image_disabled="ForwardArrow_Disabled" image_selected="ForwardArrow_Press" image_unselected="ForwardArrow_Off" @@ -323,10 +321,11 @@ label_selected="Options" layout="topleft" name="Options..." - tool_tip="Grid Options" + tool_tip="Grid options" top_delta="0" + right="-10" width="18" - height="18" > + height="19" > <button.commit_callback function="BuildTool.gridOptions"/> </button> @@ -362,8 +361,8 @@ follows="left|top" height="20" image_disabled="Object_Pyramid" - image_disabled_selected="object_pyramid_active.tga" - image_selected="object_pyramid_active.tga" + image_disabled_selected="Object_Pyramid" + image_selected="Object_Pyramid" image_unselected="Object_Pyramid" layout="topleft" left_delta="26" @@ -376,8 +375,8 @@ follows="left|top" height="20" image_disabled="Object_Tetrahedron" - image_disabled_selected="object_tetrahedron_active.tga" - image_selected="object_tetrahedron_active.tga" + image_disabled_selected="Object_Tetrahedron" + image_selected="Object_Tetrahedron" image_unselected="Object_Tetrahedron" layout="topleft" left_delta="26" @@ -715,7 +714,7 @@ layout="topleft" left="135" name="button apply to selection" - tool_tip="Modify Selected Land" + tool_tip="Modify selected land" width="78"> <button.commit_callback function="BuildTool.applyToSelection"/> @@ -727,9 +726,9 @@ follows="left|top" halign="right" layout="topleft" - right="-13" + right="-10" name="obj_count" - top_pad="8" + top_pad="6" width="143"> Objects: [COUNT] </text> @@ -739,7 +738,7 @@ follows="left|top" halign="right" layout="topleft" - right="-13" + right="-10" name="prim_count" width="143"> Prims: [COUNT] @@ -747,31 +746,32 @@ <tab_container follows="left|top" height="400" - layout="topleft" left="0" name="Object Info Tabs" tab_max_width="55" tab_min_width="40" tab_position="top" - top="180" + tab_height="25" + top="170" width="280"> - <panel - border="false" - follows="left|top|right|bottom" - label="General" - layout="topleft" - mouse_opaque="false" - help_topic="toolbox_general_tab" - name="General" - top="16"> - <panel.string - name="text deed continued"> - Deed - </panel.string> - <panel.string - name="text deed"> - Deed - </panel.string> + <panel + border="false" + follows="all" + label="General" + layout="topleft" + mouse_opaque="false" + help_topic="toolbox_general_tab" + name="General" + top="16" + width="280"> + <panel.string + name="text deed continued"> + Deed + </panel.string> + <panel.string + name="text deed"> + Deed + </panel.string> <panel.string name="text modify info 1"> You can modify this object @@ -867,7 +867,6 @@ width="90"> Creator: </text> -<!-- TODO: add person inspector to creator name --> <text type="string" length="1" @@ -890,7 +889,6 @@ width="90"> Owner: </text> -<!--TODO: add person inspector to owner name--> <text type="string" length="1" @@ -910,31 +908,31 @@ left="10" height="18" name="Group:" - top_pad="5" + top_pad="4" width="75"> Group: </text> - <button - follows="top|left" - height="10" - image_disabled="Activate_Checkmark" - image_selected="Activate_Checkmark" - image_unselected="Activate_Checkmark" - image_color="White_50" - layout="topleft" - left_pad="0" - top_delta="2" - name="button set group" - picture_style="true" - tab_stop="false" - tool_tip="Choose a group to share this object's permissions" - width="10" /> + <button + follows="top|left" + height="10" + image_disabled="Activate_Checkmark" + image_selected="Activate_Checkmark" + image_unselected="Activate_Checkmark" + image_color="White_50" + layout="topleft" + left_pad="0" + top_delta="0" + name="button set group" + picture_style="true" + tab_stop="false" + tool_tip="Choose a group to share this object's permissions" + width="10" /> <name_box follows="left|top" height="18" initial_value="Loading..." layout="topleft" - left_pad="4" + left_pad="5" top_delta="-1" name="Group Name Proxy" width="150" /> @@ -947,9 +945,9 @@ layout="topleft" name="button deed" top_pad="0" - left="83" - tool_tip="Deeding gives this item away with Next Owner permissions. Group shared objects can be deeded by a group officer." - width="100" /> + left="100" + tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer." + width="80" /> <check_box height="19" follows="left|top" @@ -968,7 +966,7 @@ top_pad="15" left="10" name="label click action" - width="100"> + width="90"> Click to: </text> <combo_box @@ -976,7 +974,7 @@ height="20" layout="topleft" name="clickaction" - width="158" + width="168" left_pad="0"> <combo_box.item label="Touch (default)" @@ -1006,7 +1004,7 @@ layout="topleft" name="checkbox for sale" left="10" - width="100" /> + width="90" /> <!-- NEW SALE TYPE COMBO BOX --> <combo_box left_pad="0" @@ -1042,38 +1040,37 @@ control_name="Edit Cost" name="Edit Cost" label="Price: L$" - label_width="70" - width="168" + label_width="65" + width="150" min_val="1" height="20" max_val="999999999" /> <check_box - height="15" - width="100" - top_pad="3" - label="Show in search" - layout="topleft" - left="100" - name="search_check" - tool_tip="Let people see this object in search results" - /> -<panel + height="15" + width="110" + top_pad="3" + label="Show in search" + layout="topleft" + left="100" + name="search_check" + tool_tip="Let people see this object in search results" /> + <panel border="false" follows="left|top" layout="topleft" mouse_opaque="false" background_visible="true" - bg_alpha_color="FloaterUnfocusBorderColor" + bg_alpha_color="DkGray" name="perms_build" left="0" - top="240" + top="241" height="120" - width="280"> + width="278"> <text type="string" length="1" left="10" - top_pad="10" + top_pad="9" text_color="EmphasisColor" height="16" follows="left|top|right" @@ -1087,7 +1084,6 @@ follows="left|top" name="Anyone can:" width="250" - top_pad="5" left="10"> Anyone: </text> @@ -1216,7 +1212,7 @@ </panel> <panel border="false" - follows="left|top|right|bottom" + follows="all" height="367" label="Object" layout="topleft" @@ -1248,7 +1244,7 @@ label="Temporary" layout="topleft" name="Temporary Checkbox Ctrl" - tool_tip="Causes object to be deleted 1 minute after creation." + tool_tip="Causes object to be deleted 1 minute after creation" top_pad="0" width="123" /> <check_box @@ -1380,7 +1376,7 @@ layout="topleft" left_delta="0" name="label rotation" - top_pad="6" + top_pad="10" width="121"> Rotation (degrees) </text> @@ -1449,7 +1445,7 @@ height="19" layout="topleft" name="comboBaseType" - top="5" + top="6" left="125" width="150"> <combo_box.item @@ -1489,7 +1485,7 @@ height="19" layout="topleft" name="material" - top_pad="0" + top_pad="5" width="150"> <combo_box.item label="Stone" @@ -1528,7 +1524,7 @@ layout="topleft" left_delta="0" name="text cut" - top_pad="6" + top_pad="5" width="150"> Path Cut (begin/end) </text> @@ -1610,7 +1606,7 @@ type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" left="125" name="Hollow Shape" @@ -1623,7 +1619,7 @@ layout="topleft" left_delta="0" name="hole" - top_pad="4" + top_pad="3" width="150"> <combo_box.item label="Default" @@ -1650,7 +1646,7 @@ layout="topleft" left_delta="0" name="text twist" - top_pad="8" + top_pad="5" width="150"> Twist (begin/end) </text> @@ -1692,7 +1688,7 @@ layout="topleft" left="125" name="scale_taper" - top_pad="6" + top_pad="3" width="150"> Taper </text> @@ -1945,7 +1941,7 @@ layout="topleft" left_delta="0" name="sculpt mirror control" - tool_tip="Flips sculpted prim along the X axis." + tool_tip="Flips sculpted prim along the X axis" top_pad="8" visible="false" width="130" /> @@ -1955,7 +1951,7 @@ layout="topleft" left_delta="0" name="sculpt invert control" - tool_tip="Inverts the sculpted prims normals, making it appear inside-out." + tool_tip="Inverts the sculpted prims normals, making it appear inside-out" top_pad="4" visible="false" width="121" /> @@ -2005,7 +2001,7 @@ <panel border="false" - follows="left|top|right|bottom" + follows="all" height="367" label="Features" layout="topleft" @@ -2045,7 +2041,7 @@ layout="topleft" left="10" name="Flexible1D Checkbox Ctrl" - tool_tip="Allows object to flex about the Z axis. (Client-side only)" + tool_tip="Allows object to flex about the Z axis (Client-side only)" top_pad="10" width="121" /> <spinner @@ -2177,7 +2173,7 @@ left_pad="10" top_pad="-17" name="colorswatch" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" width="40" /> <texture_picker allow_no_texture="true" @@ -2243,7 +2239,7 @@ </panel> <panel border="false" - follows="left|top|right|bottom" + follows="all" height="367" label="Texture" layout="topleft" @@ -2280,9 +2276,9 @@ height="80" label="Color" layout="topleft" - left_pad="25" + left_pad="15" name="colorswatch" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="0" width="64" /> <text @@ -2291,10 +2287,10 @@ follows="left|top" height="10" layout="topleft" - left_pad="20" + left_pad="15" name="color trans" top="6" - width="100"> + width="110"> Transparency % </text> <spinner @@ -2357,7 +2353,7 @@ left_delta="0" name="combobox texgen" top_pad="4" - width="87"> + width="60"> <combo_box.item label="Default" name="Default" @@ -2376,7 +2372,7 @@ name="label shininess" left_pad="5" top_pad="-36" - width="80"> + width="60"> Shininess </text> <combo_box @@ -2385,7 +2381,7 @@ left_delta="0" name="combobox shininess" top_pad="4" - width="80"> + width="60"> <combo_box.item label="None" name="None" @@ -2539,7 +2535,7 @@ name="tex scale" top_pad="5" width="200"> - Repeats per Face + Repeats / Face </text> <spinner follows="left|top" @@ -2588,9 +2584,9 @@ height="19" increment="1" initial_value="0" - label="Rotation (degrees)" + label="RotationËš" layout="topleft" - label_width="100" + label_width="100" left="10" max_val="9999" min_val="-9999" @@ -2603,7 +2599,7 @@ follows="left|top" height="19" initial_value="1" - label="Repeats Per Meter" + label="Repeats / Meter" layout="topleft" label_width="100" left="10" @@ -2615,7 +2611,7 @@ <button follows="left|top" font="SansSerifSmall" - height="18" + height="19" label="Apply" label_selected="Apply" layout="topleft" @@ -2644,7 +2640,7 @@ left="20" min_val="-1" name="TexOffsetU" - top_pad="5" + top_pad="6" width="160" /> <spinner follows="left|top" @@ -2658,99 +2654,104 @@ name="TexOffsetV" top_pad="1" width="160" /> + <panel + border="false" + follows="left|top" + layout="topleft" + mouse_opaque="false" + background_visible="true" + bg_alpha_color="DkGray" + name="Add_Media" + left="0" + top_pad="0" + height="75" + width="278"> <text type="string" length="1" follows="left|top" - height="19" + height="12" layout="topleft" left="10" - name="textbox autofix" - top_pad="4" - width="160"> - Align media texture -(must load first) - </text> - <button - follows="left|top" - font="SansSerifSmall" - height="19" - label="Align" - label_selected="Align" - layout="topleft" - left="122" - name="button align" - top_pad="-19" - width="68" /> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left="10" - top_pad="0" - name="media_tex" - width="100"> - Media: + top_pad="5" + name="media_tex" + width="260"> + Media URL </text> <line_editor - follows="left|top|right" - height="18" - layout="topleft" - left="20" + follows="left|top|right" + height="18" + layout="topleft" + left="10" read_only="true" - name="media_info" - select_on_focus="true" - top_delta="12" - width="230" /> - <button - follows="left|top" - font="SansSerifSmall" - height="13" - width="13" - image_unselected="add_btn.tga" - label="" - layout="topleft" - left="20" - name="add_media" - top_pad="3"> + name="media_info" + select_on_focus="true" + width="180" /> + <button + follows="top|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="0" + name="add_media" + picture_style="true" + tab_stop="false" + top_delta="0" + tool_tip="Add Media" + width="18"> <button.commit_callback function="BuildTool.AddMedia"/> </button> <button - follows="left|top" - font="SansSerifSmall" - height="13" - width="13" - image_unselected="del_btn.tga" - label="" - layout="topleft" - left_pad="10" - name="delete_media" - top_delta="0" - left_delta="10" > + follows="top|left" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + left_pad="5" + name="delete_media" + picture_style="true" + tool_tip="Delete this media texture" + top_delta="0" + width="18"> <button.commit_callback function="BuildTool.DeleteMedia"/> </button> - <button - follows="left|top" - font="SansSerifSmall" - height="15" - width="15" - image_unselected="gear.tga" - label="" - layout="topleft" + <button + follows="top|left" + tool_tip="Edit this Media" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left_pad="10" name="edit_media" - top_delta="0" - left_delta="190"> + picture_style="true" + top_delta="0" + width="18"> <button.commit_callback function="BuildTool.EditMedia"/> </button> - </panel> + + <button + follows="left|top" + font="SansSerifSmall" + height="19" + label="Align" + label_selected="Align Media" + layout="topleft" + left="10" + name="button align" + top_pad="5" + width="100" /> + </panel> + </panel> <panel border="false" - follows="left|top|right|bottom" + follows="all" label="Content" layout="topleft" left_delta="0" @@ -2761,7 +2762,7 @@ width="280"> <button follows="left|top" - height="22" + height="19" label="New Script" label_selected="New Script" layout="topleft" @@ -2771,7 +2772,7 @@ width="120" /> <button follows="left|top" - height="22" + height="19" label="Permissions" layout="topleft" left_pad="8" @@ -2785,10 +2786,10 @@ name="contents_inventory" top="50" width="260" /> - </panel> + </panel> </tab_container> - <panel - follows="left|top" + <panel + follows="left|top" height="384" layout="topleft" left_delta="0" diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml index 6206ea29c2..a860b1038c 100644 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ b/indra/newview/skins/default/xui/en/floater_water.xml @@ -111,7 +111,7 @@ layout="topleft" left="40" name="WaterFogColor" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="30" width="40" /> <text diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 8f88366842..f37c0e9022 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -325,7 +325,7 @@ left_pad="4" max_chars="60" name="friend combo" - tool_tip="Friend to Show on Map" + tool_tip="Friend to show on map" top_delta="-4" width="202"> <combo_box.item @@ -355,7 +355,7 @@ left_pad="4" max_chars="64" name="landmark combo" - tool_tip="Landmark to Show on Map" + tool_tip="Landmark to show on map" top_delta="-4" width="202"> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index a934e541da..5bf481e9cb 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -86,7 +86,7 @@ min_val="0.05" name="volume_slider" show_text="false" - tool_tip="Voice Volume" + tool_tip="Voice volume" top_pad="0" value="0.5" width="150" /> diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml new file mode 100644 index 0000000000..d3f599cbbf --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspect_group.xml @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater + bevel_style="in" + bg_opaque_color="MouseGray" + can_close="false" + can_minimize="false" + height="138" + layout="topleft" + name="inspect_group" + single_instance="true" + sound_flags="0" + visible="true" + width="245"> + <string name="PrivateGroup">Private group</string> + <string name="FreeToJoin">Free to join</string> + <string name="CostToJoin">L$[AMOUNT] to join</string> + <string name="YouAreMember">You are a member</string> + <text + follows="all" + font="SansSerifLargeBold" + height="18" + left="8" + name="group_name" + top="5" + text_color="white" + use_ellipses="true" + width="240" + word_wrap="false"> + Grumpity's Grumpy Group of Moose + </text> + <text + follows="all" + font="SansSerifSmallBold" + text_color="White" + height="18" + left="8" + name="group_subtitle" + use_ellipses="true" + top_pad="0" + width="170"> + 123 members + </text> + <text + follows="all" + height="50" + left="8" + name="group_details" + top_pad="0" + width="170" + word_wrap="true"> +A group of folks charged with creating a room with a moose. +Fear the moose! Fear it! And the mongoose too! + </text> + <text + follows="all" + height="15" + left="8" + name="group_cost" + top_pad="2" + width="170"> +L$123 to join + </text> + <icon + follows="all" + height="38" + right="-25" + mouse_opaque="true" + name="group_icon" + top="24" + width="38" /> + <button + follows="top|left" + height="18" + image_disabled="ForwardArrow_Disabled" + image_selected="ForwardArrow_Press" + image_unselected="ForwardArrow_Off" + name="view_profile_btn" + picture_style="true" + right="-8" + top="35" + left_delta="110" + tab_stop="false" + width="18" /> + <button + follows="bottom|left" + height="23" + label="Join" + left="8" + top="246" + name="join_btn" + width="100" + commit_callback.function="InspectGroup.Join"/> + <button + follows="bottom|left" + height="23" + label="Leave" + left="8" + top="246" + name="leave_btn" + width="100" + commit_callback.function="InspectGroup.Leave"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 72cbd3bcd5..62940b87dc 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -457,14 +457,6 @@ function="Inventory.DoToSelected" parameter="replaceoutfit" /> </menu_item_call> - <menu_item_call - label="Wear As Ensemble" - layout="topleft" - name="Wear As Ensemble"> - <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="wearasensemble" /> - </menu_item_call> <menu_item_separator layout="topleft" /> <menu_item_call @@ -486,11 +478,12 @@ parameter="open" /> </menu_item_call> <menu_item_separator - layout="topleft" /> + layout="topleft" + name="Landmark Separator" /> <menu_item_call label="About Landmark" layout="topleft" - name="Teleport To Landmark"> + name="About Landmark"> <menu_item_call.on_click function="Inventory.DoToSelected" parameter="about" /> diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml index 64fec3ab40..54a4095967 100644 --- a/indra/newview/skins/default/xui/en/menu_landmark.xml +++ b/indra/newview/skins/default/xui/en/menu_landmark.xml @@ -29,4 +29,12 @@ function="Places.OverflowMenu.Action" parameter="pick" /> </menu_item_call> + <menu_item_call + label="Add to Favorites Bar" + layout="topleft" + name="add_to_favbar"> + <menu_item_call.on_click + function="Places.OverflowMenu.Action" + parameter="add_to_favbar" /> + </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml index 3c7b6dad14..cc17e9dd4b 100644 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -2,12 +2,26 @@ <menu name="menu_group_plus" left="0" bottom="0" visible="false" mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false"> - <menu_item_call name="sort_name" label="Sort by Name"> - <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="sort_name" /> - </menu_item_call> - <menu_item_call name="sort_status" label="Sort by Status"> - <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="sort_status" /> - </menu_item_call> + <menu_item_check + label="Sort by Name" + name="sort_name"> + <menu_item_check.on_click + function="People.Friends.ViewSort.Action" + parameter="sort_name" /> + <menu_item_check.on_check + function="People.Friends.ViewSort.CheckItem" + parameter="sort_name" /> + </menu_item_check> + <menu_item_check + label="Sort by Status" + name="sort_status"> + <menu_item_check.on_click + function="People.Friends.ViewSort.Action" + parameter="sort_status" /> + <menu_item_check.on_check + function="People.Friends.ViewSort.CheckItem" + parameter="sort_status" /> + </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="view_icons" label="View People Icons"> <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="view_icons" /> diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml index ed03cd467c..d09871cff3 100644 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -2,12 +2,26 @@ <menu name="menu_group_plus" left="0" bottom="0" visible="false" mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false"> - <menu_item_call name="sort_most" label="Sort by Most Recent"> - <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_recent" /> - </menu_item_call> - <menu_item_call name="sort_name" label="Sort by Name"> - <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_name" /> - </menu_item_call> + <menu_item_check + label="Sort by Most Recent" + name="sort_most"> + <menu_item_check.on_click + function="People.Recent.ViewSort.Action" + parameter="sort_recent" /> + <menu_item_check.on_check + function="People.Recent.ViewSort.CheckItem" + parameter="sort_recent" /> + </menu_item_check> + <menu_item_check + label="Sort by Name" + name="sort_name"> + <menu_item_check.on_click + function="People.Recent.ViewSort.Action" + parameter="sort_name" /> + <menu_item_check.on_check + function="People.Recent.ViewSort.CheckItem" + parameter="sort_name" /> + </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="view_icons" label="View People Icons"> <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="view_icons" /> diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml new file mode 100644 index 0000000000..c95cf32a5a --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + bottom="806" + layout="topleft" + left="0" + mouse_opaque="false" + name="menu_folder_gear" + visible="false"> + <menu_item_call + label="Add Landmark" + layout="topleft" + name="add_landmark"> + <on_click + function="Places.LandmarksGear.Add.Action" + parameter="add_landmark" /> + </menu_item_call> + <menu_item_call + label="Add Folder" + layout="topleft" + name="add_folder"> + <on_click + function="Places.LandmarksGear.Add.Action" + parameter="category" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="category" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Cut" + layout="topleft" + name="cut"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="cut" /> + </menu_item_call> + <menu_item_call + label="Copy" + layout="topleft" + name="copy_folder"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="paste"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="paste" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="paste" /> + </menu_item_call> + <menu_item_call + label="Rename" + layout="topleft" + name="rename"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="rename" /> + </menu_item_call> + <menu_item_call + label="Delete" + layout="topleft" + name="delete"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="delete" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Expand" + layout="topleft" + name="expand"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="expand" /> + </menu_item_call> + <menu_item_call + label="Collapse" + layout="topleft" + name="collapse"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="collapse" /> + </menu_item_call> + <menu_item_call + label="Expand all folders" + layout="topleft" + name="expand_all"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="expand_all" /> + </menu_item_call> + <menu_item_call + label="Collapse all folders" + layout="topleft" + name="collapse_all"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="collapse_all" /> + </menu_item_call> + <menu_item_check + label="Sort by Date" + layout="topleft" + name="sort_by_date"> + <on_check + function="Places.LandmarksGear.Enable" + parameter="sort_by_date" /> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="sort_by_date" /> + </menu_item_check> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml new file mode 100644 index 0000000000..0246d775ee --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml @@ -0,0 +1,150 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + bottom="806" + layout="topleft" + left="0" + mouse_opaque="false" + name="menu_ladmark_gear" + visible="false"> + <menu_item_call + label="Teleport" + layout="topleft" + name="teleport"> + <on_click + function="Places.LandmarksGear.Custom.Action" + parameter="teleport" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="teleport" /> + </menu_item_call> + <menu_item_call + label="More Information" + layout="topleft" + name="more_info"> + <on_click + function="Places.LandmarksGear.Custom.Action" + parameter="more_info" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="more_info" /> + </menu_item_call> + <menu_item_call + label="Show on Map" + layout="topleft" + name="show_on_map"> + <on_click + function="Places.LandmarksGear.Custom.Action" + parameter="show_on_map" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Add Landmark" + layout="topleft" + name="add_landmark"> + <on_click + function="Places.LandmarksGear.Add.Action" + parameter="add_landmark" /> + </menu_item_call> + <menu_item_call + label="Add Folder" + layout="topleft" + name="add_folder"> + <on_click + function="Places.LandmarksGear.Add.Action" + parameter="category" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="category" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Cut" + layout="topleft" + name="cut"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="cut" /> + </menu_item_call> + <menu_item_call + label="Copy Landmark" + layout="topleft" + name="copy_landmark"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="copy" /> + </menu_item_call> + <menu_item_call + label="Copy SLURL" + layout="topleft" + name="copy_slurl"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="copy_slurl" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="paste"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="paste" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="paste" /> + </menu_item_call> + <menu_item_call + label="Rename" + layout="topleft" + name="rename"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="rename" /> + </menu_item_call> + <menu_item_call + label="Delete" + layout="topleft" + name="delete"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="delete" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Expand all folders" + layout="topleft" + name="expand_all"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="expand_all" /> + </menu_item_call> + <menu_item_call + label="Collapse all folders" + layout="topleft" + name="collapse_all"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="collapse_all" /> + </menu_item_call> + <menu_item_check + label="Sort by Date" + layout="topleft" + name="sort_by_date"> + <on_check + function="Places.LandmarksGear.Enable" + parameter="sort_by_date" /> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="sort_by_date" /> + </menu_item_check> + <menu_item_call + label="Create Pick" + layout="topleft" + name="create_pick"> + <on_click + function="Places.LandmarksGear.Custom.Action" + parameter="create_pick" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 98dd2ddd79..5979bfab4f 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -19,7 +19,7 @@ parameter="preferences" /> </menu_item_call> <menu_item_call - label="Manage My Account" + label="My Dashboard" layout="topleft" name="Manage My Account"> <menu_item_call.on_click @@ -272,6 +272,28 @@ name="Land" tear_off="true"> <menu_item_check + label="Ban Lines" + layout="topleft" + name="Ban Lines"> + <menu_item_check.on_check + control="ShowBanLines" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowBanLines" /> + </menu_item_check> + <menu_item_check + label="Beacons" + layout="topleft" + name="beacons" + shortcut="control|alt|shift|N"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="beacons" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="beacons" /> + </menu_item_check> + <menu_item_check label="Property Lines" layout="topleft" name="Property Lines" @@ -292,16 +314,6 @@ function="ToggleControl" parameter="ShowParcelOwners" /> </menu_item_check> - <menu_item_check - label="Ban Lines" - layout="topleft" - name="Ban Lines"> - <menu_item_check.on_check - control="ShowBanLines" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowBanLines" /> - </menu_item_check> </menu> <menu_item_separator layout="topleft" /> @@ -951,36 +963,6 @@ function="Tools.EnableToolNotPie" /> </menu_item_call> </menu> - <menu - create_jump_keys="true" - label="Beacons" - layout="topleft" - name="Beacons" - tear_off="true"> - <menu_item_check - label="Beacons" - layout="topleft" - name="beacons" - shortcut="control|alt|shift|N"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="beacons" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="beacons" /> - </menu_item_check> - <menu_item_check - label="Cheesy Beacon" - layout="topleft" - name="Cheesy Beacon"> - <menu_item_check.on_check - function="CheckControl" - parameter="CheesyBeacon" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="CheesyBeacon" /> - </menu_item_check> - </menu> </menu> <menu create_jump_keys="true" @@ -1229,6 +1211,17 @@ layout="topleft" name="Highlighting and Visibility" tear_off="true"> + <menu_item_check + label="Cheesy Beacon" + layout="topleft" + name="Cheesy Beacon"> + <menu_item_check.on_check + function="CheckControl" + parameter="CheesyBeacon" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="CheesyBeacon" /> + </menu_item_check> <menu_item_check label="Hide Particles" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9dcd94eb20..36a4798367 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -770,6 +770,14 @@ You can not wear clothes or body parts that are in the trash <notification icon="alertmodal.tga" + name="MaxAttachmentsOnOutfit" + type="alertmodal"> +Could not attach object. +Exceeds the attachments limit of [MAX_ATTACHMENTS] objects. Please detach another object first. + </notification> + + <notification + icon="alertmodal.tga" name="CannotWearInfoNotComplete" type="alertmodal"> You can not wear that item because it has not yet loaded. Please try again in a minute. @@ -6132,6 +6140,16 @@ Your L$ balance is shown in the upper-right. <notification icon="notify.tga" + name="BuyLindenDollarSuccess" + type="notify"> +Thank you for your payment! + +When processing completes, your L$ balance will be credited. If your payment takes more than 20 minutes to complete, the purchase amount will be credited to your account for use on your next purchase. + +Payment status can be checked on your Transaction History page at SecondLife.com. + </notification> + <notification + icon="notify.tga" name="FirstSit" type="notify"> You are sitting. diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index f7f08b9b6a..69d90e4c7d 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -38,12 +38,13 @@ width="20" /> <text follows="left|right" - font="SansSerifSmallBold" + font="SansSerifSmall" + font.style="BOLD" height="20" layout="topleft" left_pad="5" name="avatar_name" - text_color="white" + text_color="grey" top="4" use_ellipses="true" value="Unknown" diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml new file mode 100644 index 0000000000..a9f622e018 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|top|right" + height="57" + label="im_header_container" + layout="topleft" + left="8" + name="im_header_container"> + <panel + background_visible="true" + bevel_style="in" + bg_alpha_color="black" + follows="left|top|right" + height="30" + label="im_header" + layout="topleft" + name="im_header" + top_pad="17"> + <avatar_icon + follows="left" + height="20" + image_name="icon_avatar_online.tga" + layout="topleft" + left="5" + mouse_opaque="true" + name="avatar_icon" + top="5" + width="20" /> + <text + follows="left|right" + font="SansSerifBigBold" + height="20" + layout="topleft" + left_pad="10" + right="-50" + name="user_name" + text_color="white" + top="5" + value="Darth Vader" + use_ellipses="true" /> + <text + follows="right" + font="SansSerifBig" + height="20" + layout="topleft" + name="time_box" + right="0" + text_color="white" + top="5" + value="23:30" + width="50" /> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml new file mode 100644 index 0000000000..dd27595cdb --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|right|top" + height="10" + layout="topleft" + left="8" + name="chat_separator_container"> + <panel + background_visible="true" + bg_alpha_color="black" + follows="left|right|top" + height="1" + layout="topleft" + name="chat_separator_panel" + top_pad="5" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml index fde795260e..18d12aef70 100644 --- a/indra/newview/skins/default/xui/en/panel_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_classified.xml @@ -40,7 +40,7 @@ layout="topleft" left_delta="0" name="given_name_editor" - tool_tip="Name must begin with a letter or number, not punctuation." + tool_tip="Name must begin with a letter or number, not punctuation" top_delta="288" width="400" /> <text_editor @@ -61,7 +61,7 @@ layout="topleft" left="20" name="location_editor" - tool_tip="Set the location for this classified to your current position." + tool_tip="Set the location for this classified to your current position" width="400" /> <button follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml new file mode 100644 index 0000000000..40647e1b81 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_alpha_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="180" + left="10" + layout="topleft" + name="avatar_alpha_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Lower Alpha" + layout="topleft" + left="10" + name="Lower Alpha" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <check_box + control_name="LowerAlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left_pad="6" + name="lower alpha texture invisible" + top_delta="4" + width="16" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Upper Alpha" + layout="topleft" + left_pad="10" + name="Upper Alpha" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <check_box + control_name="UpperAlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left_pad="6" + name="upper alpha texture invisible" + top_delta="4" + width="16" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Head Alpha" + layout="topleft" + left_pad="10" + name="Head Alpha" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <check_box + control_name="HeadAlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left_pad="6" + name="head alpha texture invisible" + top_delta="4" + width="16" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Eye Alpha" + layout="topleft" + left="10" + name="Eye Alpha" + tool_tip="Click to choose a picture" + top="100" + width="64" /> + <check_box + control_name="Eye AlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left_pad="6" + name="eye alpha texture invisible" + top_delta="4" + width="16" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Hair Alpha" + layout="topleft" + left_pad="10" + name="Hair Alpha" + tool_tip="Click to choose a picture" + top_delta="-4" + width="64" /> + <check_box + control_name="HairAlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left_pad="6" + name="hair alpha texture invisible" + top_delta="4" + width="16" /> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml new file mode 100644 index 0000000000..9789da5796 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_eyes_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_eye_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Iris" + layout="topleft" + left="8" + name="Iris" + tool_tip="Click to choose a picture" + top_pad="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="eyes_main_tab" + title="Eyes"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="eyes_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml new file mode 100644 index 0000000000..517cdd75fb --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_gloves_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_gloves_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="10" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="gloves_main_tab" + title="Gloves"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="gloves_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml new file mode 100644 index 0000000000..d2ee2ebf2a --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_hair.xml @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_hair_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_hair_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Texture" + layout="topleft" + left="8" + name="Texture" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="hair_color_tab" + title="Color"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="hair_color_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="hair_style_tab" + title="Style"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="hair_style_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="hair_eyebrows_tab" + title="Eyebrows"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="hair_eyebrows_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="hair_facial_tab" + title="Facial"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="hair_facial_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml new file mode 100644 index 0000000000..0b54944e29 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_jacket_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_jacket_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Upper Fabric" + layout="topleft" + left="10" + name="Upper Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Lower Fabric" + layout="topleft" + left_pad="10" + name="Lower Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="10" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="jacket_main_tab" + title="Jacket"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="jacket_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml new file mode 100644 index 0000000000..939314f9f9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_pants_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_pants_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="10" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="pants_main_tab" + title="Pants"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="pants_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + 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 453e1319a6..bac6f6e4d1 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -2,73 +2,79 @@ <panel background_visible="true" bevel_style="in" + follows="left|top|right|bottom" height="570" label="Edit Pick" layout="topleft" left="0" + min_height="350" name="panel_edit_pick" top="0" width="333"> + <button + follows="top|right" + height="23" + image_overlay="BackArrow_Off" + layout="topleft" + name="back_btn" + picture_style="true" + left="10" + tab_stop="false" + top="2" + width="23" /> <text type="string" length="1" follows="top" - font="SansSerifHugeBold" + font="SansSerifHuge" height="15" layout="topleft" - left="10" + left_pad="10" name="title" text_color="white" top="5" width="250"> Edit Pick </text> - <button - follows="top|right" - height="20" - image_overlay="BackArrow_Off" - layout="topleft" - name="back_btn" - picture_style="true" - right="-20" - top="7" - width="20" /> <scroll_container color="DkGray2" - follows="left|top|right|bottom" - height="470" + follows="all" + height="510" layout="topleft" left="10" top_pad="10" name="profile_scroll" - reserve_scroll_corner="true" + reserve_scroll_corner="false" opaque="true" width="313"> <panel name="scroll_content_panel" - follows="left|top|right" + follows="left|top" + min_height="300" layout="topleft" top="0" + background_visible="false" + height="470" left="0" - width="298" - height="555"> + width="295"> <texture_picker follows="left|top|right" height="197" - width="280" + width="290" layout="topleft" top="20" left="10" name="pick_snapshot" /> - <icon - height="16" - image_name="image_edit_icon.tga" - layout="topleft" - name="edit_icon" - left="245" - top="35" - visible="true" - width="16" /> + <button + height="18" + image_overlay="AddItem_Off" + layout="topleft" + right="-5" + name="edit_icon" + label="" + tool_tip="Click to select an image" + top="27" + width="18" /> <text type="string" length="1" @@ -80,8 +86,9 @@ left="10" top="215" name="Name:" - text_color="white"> - Name: + text_color="white" + width="290"> + Title: </text> <line_editor follows="left|top|right" @@ -93,7 +100,7 @@ max_length="63" name="pick_name" text_color="black" - width="280" /> + width="290" /> <text type="string" length="1" @@ -105,13 +112,14 @@ left="10" top_pad="20" name="description_label" - text_color="white"> + text_color="white" + width="290"> Description: </text> <text_editor follows="left|top|right" height="100" - width="280" + width="290" hide_scrollbar="false" layout="topleft" left="10" @@ -131,7 +139,8 @@ left="10" name="location_label" text_color="white" - top_pad="20"> + top_pad="20" + width="290"> Location: </text> <text @@ -144,8 +153,7 @@ name="pick_location" right="-10" top_pad="2" - text_color="white" - width="280" + width="290" word_wrap="true"> loading... </text> @@ -154,22 +162,24 @@ height="20" label="Set to Current Location" layout="topleft" - left="10" + left="8" + top_pad="0" name="set_to_curr_location_btn" width="200" /> </panel> </scroll_container> <panel follows="left|right|bottom" - height="30" + height="20" label="bottom_panel" layout="topleft" left="10" name="bottom_panel" - top_pad="2"> + top_pad="5" + width="303"> <button follows="bottom|left" - height="25" + height="19" label="Save [WHAT]" layout="topleft" name="save_changes_btn" @@ -178,12 +188,12 @@ width="130" /> <button follows="bottom|left" - height="25" + height="19" label="Cancel" layout="topleft" name="cancel_btn" left_pad="5" - top_delta="0" + right="-1" width="130" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 0202323dcf..d268258f6f 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -1,20 +1,17 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - class="edit_profile_panel" - background_visible="true" - bevel_style="in" - follows="left|top|right|bottom" - height="420" + class="edit_profile_panel" + follows="all" + height="535" label="Profile Edit" layout="topleft" - left="10" - mouse_opaque="true" + left="0" name="edit_profile_panel" - top="10" - width="255"> + top="0" + width="313"> <string name="CaptionTextAcctInfo"> - [ACCTTYPE] + [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] </string> <string @@ -51,192 +48,151 @@ <string name="no_partner_text" value="None" /> - <scroll_container + <scroll_container color="DkGray2" - follows="left|top|right|bottom" - height="300" + follows="all" + height="505" + min_height="300" layout="topleft" left="0" name="profile_scroll" reserve_scroll_corner="true" opaque="true" - width="255"> + top="0"> + <panel + name="scroll_content_panel" + follows="left|top|right" + layout="topleft" + top="0" + height="505" + min_height="300" + left="0" + width="313"> <panel - name="scroll_content_panel" + name="data_panel" follows="left|top|right" - layout="topleft" - top="0" - left="0" - width="240" - height="760"> - <panel - background_visible="true" - bg_alpha_color="DkGray2" - follows="left|top|right|bottom" - height="750" - layout="topleft" - left="0" - name="data_panel" - top_pad="10" - width="260"> + layout="topleft" + top="0" + height="505" + min_height="300" + left="0" + width="313"> <panel - follows="left|top" - height="120" - layout="topleft" - left="10" name="lifes_images_panel" - top_pad="10" - width="265"> - <panel - height="137" - layout="topleft" - left="0" - name="second_life_image_panel" - top="0" - width="125"> - <text - type="string" - length="1" - follows="left|top|right|bottom" - font="SansSerifSmall" - font.style="BOLD" - height="15" - layout="topleft" - left="0" - name="second_life_photo_title_text" - text_color="white" - top="0" - width="240"> - [SECOND_LIFE]: - </text> - <texture_picker - allow_no_texture="true" - default_image_name="None" - follows="top|left" - height="117" - layout="topleft" - left="0" - name="2nd_life_pic" - top_pad="5" - width="102" /> + follows="left|top|right" + height="244" + layout="topleft" + top="0" + left="0" + width="285"> + <panel + follows="left|top" + height="117" + layout="topleft" + left="10" + name="second_life_image_panel" + top="0" + width="285"> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left="0" + name="second_life_photo_title_text" + text_color="white" + value="[SECOND_LIFE]:" + width="170" /> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="117" + layout="topleft" + left="0" + name="2nd_life_pic" + top_pad="0" + width="102" /> </panel> - <icon - height="16" - image_name="image_edit_icon.tga" + <button + height="18" + image_overlay="AddItem_Off" layout="topleft" - left="75" name="2nd_life_edit_icon" - tool_tip="Click to select an image" - top="35" - width="16" /> + label="" + left="87" + tool_tip="Click to select an image" + top="25" + width="18" /> </panel> <text_editor type="string" length="1" follows="left|top|right" font="SansSerifSmall" - height="125" + height="100" layout="topleft" left="120" - top="30" - max_length="511" + top="18" name="sl_description_edit" - width="115" + width="173" word_wrap="true"> </text_editor> <panel - height="137" - layout="topleft" - left="10" - name="first_life_image_panel" - top_pad="20" - width="125"> - <text - type="string" - length="1" - follows="left|top|right|bottom" - font="SansSerifSmall" - font.style="BOLD" - height="15" - layout="topleft" - left="0" - name="real_world_photo_title_text" - text_color="white" - top="0" - width="125"> - Real World: - </text> - <texture_picker - allow_no_texture="true" - default_image_name="None" - follows="top|left" - height="117" - layout="topleft" - left="0" - name="real_world_pic" - top_pad="5" - width="102" /> + follows="left|top" + height="117" + layout="topleft" + top_pad="5" + left="10" + name="first_life_image_panel" + width="285"> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left="0" + name="real_world_photo_title_text" + text_color="white" + value="Real World:" + width="173" /> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="117" + layout="topleft" + left="0" + name="real_world_pic" + top_pad="0" + width="102" /> </panel> - <icon - height="16" - image_name="image_edit_icon.tga" + <button + height="18" + image_overlay="AddItem_Off" layout="topleft" - left="85" name="real_world_edit_icon" - tool_tip="Click to select an image" - top="210" - width="16" /> + label="" + left="87" + tool_tip="Click to select an image" + top="148" + width="18" /> <text_editor type="string" length="1" follows="left|top|right" font="SansSerifSmall" - height="125" + height="100" layout="topleft" left="120" - top="195" - max_length="254" + top="142" name="fl_description_edit" - width="115" + width="173" word_wrap="true"> </text_editor> <text - type="string" - follows="left|top" - font="SansSerifSmall" - font.style="BOLD" - height="15" - layout="topleft" - left="10" - name="online_me_status_text" - text_color="white" - top_pad="20" - width="255"> - Status: - </text> - <combo_box - font="SansSerifSmall" - follows="left|top" - height="18" - layout="topleft" - left="10" - top_pad="5" - name="status_combo" - width="140"> - <combo_box.item - label="Online" - name="online" - value="online" /> - <combo_box.item - label="Away" - name="away" - value="away" /> - <combo_box.item - label="Busy" - name="busy" - value="busy" /> - </combo_box> - <text type="string" length="1" follows="left|top" @@ -247,8 +203,8 @@ left="10" name="title_homepage_text" text_color="white" - top_pad="20" - width="240"> + top_pad="10" + width="285"> Homepage: </text> <line_editor @@ -256,45 +212,45 @@ font="SansSerifSmall" height="20" layout="topleft" - left="9" + left="10" + top_pad="0" + value="http://" name="homepage_edit" - width="220"> - TODO + width="285"> </line_editor> <check_box follows="left|top" font="SansSerifSmall" - label="Show me in Search results" + label="Show me in Search results" layout="topleft" left="10" name="show_in_search_checkbox" - height="16" + height="15" text_enabled_color="white" - top_pad="20" - width="240"/> + top_pad="10" + width="240" /> <text follows="left|top" font="SansSerifSmall" - font.style="BOLD" + font.style="BOLD" height="15" layout="topleft" left="10" name="title_acc_status_text" text_color="white" - top_pad="15" - value="Account Status:" - width="100" /> + top_pad="5" + value="My Account:" + width="285" /> <text type="string" follows="left|top" font="SansSerifSmall" height="15" layout="topleft" - left_pad="10" + left="10" name="my_account_link" - top_delta="0" - value="Go to Dashboard" - width="100"/> + value="Go to My Dashboard" + width="285" /> <text follows="left|top|right" height="20" @@ -303,7 +259,7 @@ name="acc_status_text" top_pad="5" value="Resident. No payment info on file." - width="255" + width="285" word_wrap="true" /> <text follows="left|top" @@ -314,26 +270,26 @@ left="10" name="title_partner_text" text_color="white" - top_pad="15" - value="Partner:" - width="100" /> + top_pad="0" + value="My Partner:" + width="150" /> <text follows="left|top" height="15" + halign="right" layout="topleft" left_pad="10" + right="-10" name="partner_edit_link" - top_delta="0" value="[[URL] Edit]" - width="100" /> + width="150" /> <panel follows="left|top|right" height="15" layout="topleft" left="10" name="partner_data_panel" - top_pad="10" - width="255"> + width="285"> <text follows="left|top|right" height="30" @@ -342,7 +298,7 @@ name="partner_text" top="0" value="[FIRST] [LAST]" - width="240" + width="285" word_wrap="true" /> </panel> <text @@ -356,36 +312,36 @@ left="10" name="title_afk_text" text_color="white" - top_pad="15" - width="240"> + top_pad="0" + width="190"> Away Timeout: </text> <spinner control_name="AFKTimeout" decimal_digits="0" follows="left|top" - height="16" + halign="right" + height="15" increment="1" initial_value="300" label="" label_width="0" layout="topleft" - left="10" max_val="600" min_val="30" name="afk_timeout_spinner" - top_pad="5" + left_pad="4" width="50" /> <text type="string" length="1" follows="left|top" - height="10" + halign="left" + height="15" layout="topleft" - left_pad="10" + left_pad="2" name="seconds_textbox" - top_delta="0" - width="128"> + width="70"> seconds </text> <text @@ -394,12 +350,12 @@ follows="left|top" height="10" layout="topleft" - font="SansSerifSmall" + font="SansSerifSmall" font.style="BOLD" - left="12" + text_color="white" + left="10" mouse_opaque="false" name="text_box3" - top_pad="25" width="240"> Busy Mode Response: </text> @@ -407,29 +363,27 @@ control_name="BusyModeResponse2" commit_on_focus_lost = "true" follows="left|top" - height="70" + height="56" layout="topleft" - left="12" + left="10" name="busy_response" - top_pad="10" - width="240" + width="285" word_wrap="true"> log_in_to_change - </text_editor> + </text_editor> </panel> </panel> </scroll_container> - <panel + <panel follows="bottom|left" - height="30" + height="20" left="10" name="profile_me_buttons_panel" - top_pad="10" - width="240"> + top_pad="5" + width="303"> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" + height="19" label="Save Changes" layout="topleft" left="0" @@ -438,16 +392,12 @@ width="130" /> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" + height="19" label="Cancel" layout="topleft" - left_pad="5" + left_pad="10" name="cancel_btn" - top_delta="0" + right="-1" width="130" /> </panel> </panel> - - - diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml new file mode 100644 index 0000000000..a9dfcb82d6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_shape_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="top|left" + height="50" + left="10" + layout="topleft" + name="avatar_sex_panel" + top="10" + width="293" > + <text + follows="top|left" + height="16" + layout="topleft" + left="10" + name="gender_text" + width="303"> + Gender: + </text> + <radio_group + follows="all" + left="10" + height="34" + layout="topleft" + name="sex_radio" + top_pad="3" + width="200" > + <radio_item + follows="all" + height="16" + label="Female" + layout="topleft" + left="10" + name="radio" + width="82" /> + <radio_item + follows="all" + height="16" + label="Male" + layout="topleft" + left_pad="10" + name="radio2" + width="82" /> + </radio_group> + </panel> + <accordion + follows="left|top|right|bottom" + height ="330" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shape_body_tab" + title="Body"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shape_body_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shape_head_tab" + title="Head"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shape_head_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shape_eyes_tab" + title="Eyes"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shape_eyes_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shape_ears_tab" + title="Ears"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shape_ears_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shape_nose_tab" + title="Nose"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shape_nose_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shape_mouth_tab" + title="Mouth"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shape_mouth_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shape_chin_tab" + title="Chin"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shape_chin_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shape_torso_tab" + title="Torso"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shape_torso_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shape_legs_tab" + title="Legs"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shape_legs_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml new file mode 100644 index 0000000000..258ee06697 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_shirt_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_shirt_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="10" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shirt_main_tab" + title="Shirt"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shirt_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml new file mode 100644 index 0000000000..22fced4aac --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_shoes_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_shoes_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="10" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="shoes_main_tab" + title="Shoes"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="shoes_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml new file mode 100644 index 0000000000..1a00277f43 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_skin.xml @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_skin_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_skin_color_panel" + top="0" + width="293" > + <texture_picker + allow_no_texture="true" + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Head Tattoos" + layout="topleft" + left="10" + name="Head Tattoos" + tool_tip="Click to choose a picture" + top="10" + width="74" /> + <texture_picker + allow_no_texture="true" + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Upper Tattoos" + layout="topleft" + left_pad="10" + name="Upper Tattoos" + tool_tip="Click to choose a picture" + top="10" + width="74" /> + <texture_picker + allow_no_texture="true" + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Lower Tattoos" + layout="topleft" + left_pad="10" + name="Lower Tattoos" + tool_tip="Click to choose a picture" + top="10" + width="74" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="skin_color_tab" + title="Skin Color"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="skin_color_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="skin_face_tab" + title="Face Detail"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="skin_face_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="skin_makeup_tab" + title="Makeup"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="skin_makeup_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="skin_body_tab" + title="Body Detail"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="skin_body_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml new file mode 100644 index 0000000000..411d433604 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_skirt_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_skirt_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="10" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="skirt_main_tab" + title="Skirt"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="skirt_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml new file mode 100644 index 0000000000..faff67795c --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_socks_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_socks_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="10" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="socks_main_tab" + title="Socks"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="socks_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml new file mode 100644 index 0000000000..b214cd3de0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_tattoo_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_tattoo_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Head Tattoo" + layout="topleft" + left="10" + name="Head Tattoo" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Upper Tattoo" + layout="topleft" + left_pad="10" + name="Upper Tattoo" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Lower Tattoo" + layout="topleft" + left_pad="10" + name="Lower Tattoo" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml new file mode 100644 index 0000000000..bb0b353a01 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_underpants_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_underpants_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="10" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="underpants_main_tab" + title="Underpants"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="underpants_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml new file mode 100644 index 0000000000..097cb14ee6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_undershirt_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_undershirt_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="10" + name="Color/Tint" + tool_tip="Click to open Color Picker" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="undershirt_main_tab" + title="Undershirt"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="undershirt_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml new file mode 100644 index 0000000000..77b887de9b --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -0,0 +1,365 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bevel_style="in" + follows="all" + height="570" + label="Wearable" + layout="topleft" +left="0" + name="panel_edit_wearable" + top="0" + width="333"> + <string + name="edit_shape_title"> + Editing Shape + </string> + <string + name="edit_skin_title"> + Editing Skin + </string> + <string + name="edit_hair_title"> + Editing Hair + </string> + <string + name="edit_eyes_title"> + Editing Eyes + </string> + <string + name="edit_shirt_title"> + Editing Shirt + </string> + <string + name="edit_pants_title"> + Editing Pants + </string> + <string + name="edit_shoes_title"> + Editing Shoes + </string> + <string + name="edit_socks_title"> + Editing Socks + </string> + <string + name="edit_jacket_title"> + Editing Jacket + </string> + <string + name="edit_skirt_title"> + Editing Skirt + </string> + <string + name="edit_gloves_title"> + Editing Gloves + </string> + <string + name="edit_undershirt_title"> + Editing Undershirt + </string> + <string + name="edit_underpants_title"> + Editing Underpants + </string> + <string + name="edit_alpha_title"> + Editing Alpha Mask + </string> + <string + name="edit_tattoo_title"> + Editing Tattoo + </string> + <string + name="shape_desc_text"> + Shape: + </string> + <string + name="skin_desc_text"> + Skin: + </string> + <string + name="hair_desc_text"> + Hair: + </string> + <string + name="eyes_desc_text"> + Eyes: + </string> + <string + name="shirt_desc_text"> + Shirt: + </string> + <string + name="pants_desc_text"> + Pants: + </string> + <string + name="shoes_desc_text"> + Shoes: + </string> + <string + name="socks_desc_text"> + Socks: + </string> + <string + name="jacket_desc_text"> + Jacket: + </string> + <string + name="skirt_skirt_desc_text"> + Skirt: + </string> + <string + name="gloves_desc_text"> + Gloves: + </string> + <string + name="undershirt_desc_text"> + Undershirt: + </string> + <string + name="underpants_desc_text"> + Underpants: + </string> + <string + name="alpha_desc_text"> + Alpha Mask: + </string> + <string + name="tattoo_desc_text"> + Tattoo: + </string> + <button + follows="top|left" + height="25" + width="25" + image_overlay="BackArrow_Off" + layout="topleft" + name="back_btn" + picture_style="true" + left="10" + top="7" /> + <text + follows="top|left" + font="SansSerifHugeBold" + height="22" + layout="topleft" + left_pad="15" + name="edit_wearable_title" + text_color="white" + value="Editing Shape" + width="270" /> + <panel + border="true" + follows="top|left" + height="60" + label="Shirt" + layout="topleft" + left="10" + name="wearable_type_panel" + top_pad="10" + width="313"> + <text + follows="top|left" + height="16" + layout="topleft" + left="10" + name="description_text" + value="Shape:" + width="303" /> + <text_editor + follows="all" + height="23" + left="10" + layout="topleft" + max_length="300" + name="description" + width="290" /> + </panel> + <panel + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_subpanel_container" + top_pad="10" + width="333"> + <panel + filename="panel_edit_shape.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_shape_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_skin.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_skin_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_hair.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_hair_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_eyes.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_eyes_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_shirt.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_shirt_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_pants.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_pants_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_shoes.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_shoes_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_socks.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_socks_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_jacket.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_jacket_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_skirt.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_skirt_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_gloves.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_gloves_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_undershirt.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_undershirt_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_underpants.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_underpants_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_alpha.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_alpha_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_tattoo.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_tattoo_panel" + top="0" + visible="false" + width="333" /> + </panel> + <panel + follows="all" + height="25" + layout="bottom|left|right" + left="0" + name="button_panel" + top_pad="10" + width="333" > + <button + follows="bottomleft" + layout="topleft" + height="23" + label="Save As" + left="10" + name="save_as_button" + top="0" + width="100" /> + <button + follows="bottomleft" + layout="topleft" + height="23" + label="Revert" + left_pad="10" + name="revert_button" + width="100" /> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 6f01202680..c18b625033 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -24,20 +24,6 @@ Hover your mouse over the options for more help. name="incomplete_member_data_str"> Retrieving member data </panel.string> - <panel.string - name="group_join_btn"> - Join (L$[AMOUNT]) - </panel.string> - <!--<button - follows="left|top" - height="16" - label="?" - label_selected="?" - layout="topleft" - left="255" - name="help_button" - top="8" - width="20" /> --> <text_editor type="string" follows="left|top" @@ -130,7 +116,7 @@ Hover your mouse over the options for more help. layout="topleft" left_delta="0" name="list_groups_in_profile" - tool_tip="Sets whether you want to show this group in your Profile" + tool_tip="Sets whether you want to show this group in your profile" top_pad="5" width="240" /> <panel @@ -161,7 +147,7 @@ Hover your mouse over the options for more help. layout="topleft" left_delta="0" name="check_enrollment_fee" - tool_tip="Sets whether to require an enrollment fee to join the group." + tool_tip="Sets whether to require an enrollment fee to join the group" top_pad="5" width="90" /> <spinner @@ -187,7 +173,7 @@ Hover your mouse over the options for more help. layout="topleft" left="4" name="show_in_group_list" - tool_tip="Let people see this group in search results." + tool_tip="Let people see this group in search results" top_pad="4" width="90" /> <combo_box @@ -195,7 +181,7 @@ Hover your mouse over the options for more help. layout="topleft" left_delta="0" name="group_mature_check" - tool_tip="Sets whether your group information is considered mature." + tool_tip="Sets whether your group information is considered mature" top_pad="10" width="240"> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index fb4ce436e8..c3b277fb1d 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -20,6 +20,10 @@ name="group_join_btn"> Join (L$[AMOUNT]) </panel.string> + <panel.string + name="group_join_free"> + Free + </panel.string> <button layout="topleft" name="back" @@ -87,16 +91,28 @@ top_pad="10" use_ellipses="true" width="140" /> + <text + type="string" + follows="left|top" + height="16" + layout="topleft" + left_delta="0" + name="join_cost_text" + top_pad="10" + visible="true" + width="140"> + Free + </text> <button follows="left|top" left_delta="0" top_pad="10" height="20" - label="Join" - label_selected="Join" + label="Join now!" + label_selected="Join now!" name="btn_join" visible="true" - width="65" /> + width="85" /> <button top="632" height="20" diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml index 68b30faa1c..1996977acb 100644 --- a/indra/newview/skins/default/xui/en/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml @@ -49,7 +49,7 @@ Resident Chooser' to start. left_delta="0" multi_select="true" name="invitee_list" - tool_tip="Hold the Ctrl key and click resident names to multi-select." + tool_tip="Hold the Ctrl key and click resident names to multi-select" top_pad="4" width="200" /> <button @@ -59,7 +59,7 @@ Resident Chooser' to start. layout="topleft" left_delta="0" name="remove_button" - tool_tip="Removes residents selected above from the invite list." + tool_tip="Removes residents selected above from the invite list" top_pad="4" width="200" /> <text @@ -78,7 +78,7 @@ Resident Chooser' to start. layout="topleft" left_delta="0" name="role_name" - tool_tip="Choose from the list of Roles you are allowed to assign members to." + tool_tip="Choose from the list of Roles you are allowed to assign members to" top_delta="16" width="196" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index bf861af4f2..75ded4f249 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -464,7 +464,7 @@ things in this group. There's a broad variety of Abilities. multi_select="true" name="action_list" search_column="1" - tool_tip="Select an Ability to view more details." + tool_tip="Select an Ability to view more details" top_pad="6" width="255"> <scroll_list.columns @@ -542,7 +542,7 @@ things in this group. There's a broad variety of Abilities. follows="left|top" left_pad="5" name="member_allowed_actions" - tool_tip="For Details of each Allowed Ability see the Abilities tab." + tool_tip="For details of each allowed ability see the abilities tab" top_delta="0" width="130"> <scroll_list.columns @@ -655,7 +655,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left_pad="15" name="static5" - tool_tip="A list of Abilities the currently selected role can perform." + tool_tip="A list of abilities the currently selected role can perform" top_delta="0" width="100"> Allowed Abilities @@ -674,7 +674,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left_delta="0" name="role_visible_in_list" - tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." + tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." top_pad="10" width="130" /> <scroll_list @@ -684,7 +684,7 @@ things in this group. There's a broad variety of Abilities. left="135" name="role_allowed_actions" search_column="2" - tool_tip="For Details of each Allowed Ability see the Abilities tab." + tool_tip="For details of each allowed ability see the abilities tab" top="101" width="130"> <scroll_list.columns diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index 9ee80a37d7..ad452b16a7 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -1,34 +1,143 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="Landmarks" - bottom="0" - height="326" + top="0" + height="400" + layout="topleft" left="0" width="380" border="true" background_visible="true" bg_alpha_color="DkGray2" follows="left|top|right|bottom"> - <inventory_panel - allow_multi_select="true" - border="true" - bottom="0" - follows="left|top|right|bottom" - height="326" - left="0" - mouse_opaque="true" - name="landmarks_list" - width="380"/> - <button - bottom="0" - halign="center" - height="16" - label=">" - enabled="false" - mouse_opaque="false" - name="selector" - width="20" - left="0" - follows="right|bottom" - tool_tip="View landmark properties"/> + <accordion + follows="left|top|right|bottom" + height="368" + layout="topleft" + left="0" + name="landmarks_accordion" + top="2" + width="380"> + <accordion_tab + layout="topleft" + name="tab_favorites" + title="Favorites bar"> + <inventory_subtree_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="126" + left="0" + mouse_opaque="true" + name="favorites_list" + width="380"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_landmarks" + title="Landmarks"> + <inventory_subtree_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="126" + left="0" + mouse_opaque="true" + name="landmarks_list" + start_folder="landmark" + width="380"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_inventory" + title="My Inventory"> + <inventory_subtree_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="126" + left="0" + mouse_opaque="true" + name="my_inventory_list" + width="380"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_library" + title="Library"> + <inventory_subtree_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="120" + left="0" + mouse_opaque="true" + name="library_list" + width="380"/> + </accordion_tab> + </accordion> + <panel + background_visible="true" + bevel_style="none" + bottom="0" + follows="left|right|bottom" + height="30" + layout="bottomleft" + left="0" + name="bottom_panel" + width="380"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="10" + name="options_gear_btn" + picture_style="true" + top="6" + width="18" /> + <button + follows="bottom|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="5" + name="add_landmark_btn" + picture_style="true" + tool_tip="Add new landmark" + width="18" /> + <button + follows="bottom|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="5" + name="add_folder_btn" + picture_style="true" + tool_tip="Add new folder" + width="18" /> + <button + follows="bottom|right" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + right="-5" + name="trash_btn" + picture_style="true" + tool_tip="Remove selected landmark" + top="6" + width="18" /> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml new file mode 100644 index 0000000000..4d890b1d46 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_opaque="true" + background_visible="false" + bg_alpha_color="0.3 0.3 0.3 0" + height="140" + label="notification_panel" + layout="topleft" + left="0" + name="notification_panel" + top="0" + width="350"> + <panel + background_visible="true" + follows="left|right|top" + height="100" + label="info_panel" + layout="topleft" + left="0" + name="info_panel" + top="0" + width="350"> + <text + border_visible="false" + follows="left|right|top|bottom" + font="SansSerif" + height="90" + layout="topleft" + left="45" + name="text_box" + read_only="true" + text_color="white" + top="5" + visible="false" + width="300" + wrap="true"/> + <text + border_visible="false" + follows="left|right|top|bottom" + font="SansSerifBold" + height="90" + layout="topleft" + left="45" + name="caution_text_box" + text_color="1 0.82 0.46 1" + top="5" + visible="false" + width="300" + wrap="true"/> + <text_editor + bg_readonly_color="0.0 0.0 0.0 0" + border_visible="false" + embedded_items="false" + enabled="false" + follows="left|right|top|bottom" + font="SansSerif" + height="90" + layout="topleft" + left="45" + mouse_opaque="false" + name="text_editor_box" + read_only="true" + tab_stop="false" + text_color="white" + text_readonly_color="white" + top="5" + visible="false" + width="300" + wrap="true"/> + </panel> + <panel + background_visible="true" + follows="left|right|bottom" + height="40" + label="control_panel" + layout="topleft" + left="0" + name="control_panel" + top_pad="0" + width="350"> + </panel> + <icon + follows="left|top" + height="32" + image_name="notify_tip_icon.tga" + layout="topleft" + left="8" + mouse_opaque="false" + name="info_icon" + top="20" + width="32" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index b51d53a1b4..e53edf891d 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -86,8 +86,7 @@ color="DkGray" width="313"> <button follows="bottom|left" - font="SansSerifBigBold" - tool_tip="Change sort and view of Residents list" + tool_tip="Change sort and view of residents list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -166,8 +165,7 @@ color="DkGray" width="313"> <button follows="bottom|left" - font="SansSerifBigBold" - tool_tip="Change sort and view of Friends list" + tool_tip="Change sort and view of friends list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -180,7 +178,6 @@ color="DkGray" width="18" /> <button follows="bottom|left" - font="SansSerifBigBold" height="18" image_selected="AddItem_Press" image_unselected="AddItem_Off" @@ -194,7 +191,6 @@ color="DkGray" width="18" /> <button follows="bottom|left" - font="SansSerifBigBold" height="18" image_selected="TrashItem_Press" image_unselected="TrashItem_Off" @@ -211,7 +207,7 @@ color="DkGray" <panel background_visible="true" bevel_style="none" - follows="left|top|right|bottom" + follows="all" height="390" label="Groups" top="0" @@ -220,7 +216,7 @@ color="DkGray" name="groups_panel" width="313"> <group_list - follows="left|top|right|bottom" + follows="all" height="357" layout="topleft" color="DkGray2" @@ -241,8 +237,7 @@ color="DkGray" width="313"> <button follows="bottom|left" - font="SansSerifBigBold" - tool_tip="Change sort and view of Groups list" + tool_tip="Change sort and view of groups list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -255,7 +250,6 @@ color="DkGray" width="18" /> <button follows="bottom|left" - font="SansSerifBigBold" height="18" image_selected="AddItem_Press" image_unselected="AddItem_Off" @@ -269,11 +263,10 @@ color="DkGray" width="18" /> <button follows="bottom|left" - font="SansSerifBigBold" height="10" - image_hover_selected="group_activate_btn.tga" - image_selected="group_activate_btn.tga" - image_unselected="group_activate_btn.tga" + image_hover_selected="Activate_Checkmark" + image_selected="Activate_Checkmark" + image_unselected="Activate_Checkmark" layout="topleft" left_pad="24" name="activate_btn" @@ -283,7 +276,6 @@ color="DkGray" width="10" /> <button follows="bottom|left" - font="SansSerifBigBold" height="18" image_selected="TrashItem_Press" image_unselected="TrashItem_Off" @@ -300,7 +292,7 @@ color="DkGray" background_visible="true" bevel_style="none" top="0" - follows="left|top|right|bottom" + follows="all" height="390" label="Recent" layout="topleft" @@ -309,7 +301,7 @@ color="DkGray" width="313"> <avatar_list color="DkGray2" - follows="left|top|right|bottom" + follows="all" height="357" layout="topleft" left="0" @@ -330,7 +322,7 @@ color="DkGray" <button follows="bottom|left" font="SansSerifBigBold" - tool_tip="Change sort and view of Recent Residents list" + tool_tip="Change sort and view of recent residents list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -390,7 +382,7 @@ color="DkGray" label="Add Friend" layout="topleft" name="add_friend_btn" - tool_tip="Add selected resident to your Friends List" + tool_tip="Add selected resident to your friends List" width="85" /> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 7d5ae3d78a..a67ae59b4a 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -1,43 +1,47 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - bevel_style="in" - follows="left|top|right|bottom" + background_visible="true" + follows="all" height="570" layout="topleft" left="0" + min_height="350" name="panel_pick_info" top="0" width="333"> <button - follows="top|left" - height="25" - width="25" + follows="top|right" + height="23" image_overlay="BackArrow_Off" layout="topleft" name="back_btn" picture_style="true" left="10" - top="7" /> + tab_stop="false" + top="2" + width="23" /> <text - follows="top|left" + follows="top|left|right" font="SansSerifHugeBold" - height="22" + height="26" layout="topleft" - left_pad="15" + left_pad="10" name="title" text_color="white" + top="0" value="Pick Info" - width="270" /> + use_elipsis="true" + width="275" /> <scroll_container color="DkGray2" opaque="true" follows="all" - height="470" + height="500" layout="topleft" left="10" top_pad="10" name="profile_scroll" - reserve_scroll_corner="true" + reserve_scroll_corner="false" width="313"> <panel name="scroll_content_panel" @@ -57,11 +61,11 @@ left="10" name="pick_snapshot" top="20" - width="280" /> + width="290" /> <text follows="left|top|right" - height="20" - width="280" + height="35" + width="290" layout="topleft" font="SansSerifBig" font.style="BOLD" @@ -70,14 +74,14 @@ name="pick_name" text_color="white" value="[name]" - word_wrap="true" /> + use_ellipses="true" /> <text follows="left|top" height="25" layout="topleft" left="10" name="pick_location" - width="280" + width="290" word_wrap="true" value="[loading...]" /> <text @@ -86,47 +90,47 @@ layout="topleft" left="10" name="pick_desc" - width="280" + width="290" value="[description]" word_wrap="true" /> </panel> </scroll_container> <panel follows="left|right|bottom" - height="30" + height="20" layout="topleft" - top_pad="5" + top_pad="8" left="10" name="buttons"> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Edit" + font="SansSerifSmall" + height="19" + label="Teleport" layout="topleft" left="0" - name="edit_btn" + name="teleport_btn" top="0" - width="80" /> + width="90" /> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Teleport" + font="SansSerifSmall" + height="19" + label="Map" layout="topleft" - left_pad="5" - name="teleport_btn" + left_pad="10" + name="show_on_map_btn" top="0" - width="80" /> + width="90" /> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Map" + font="SansSerifSmall" + height="19" + label="Edit" layout="topleft" - left_pad="5" - name="show_on_map_btn" + right="-1" + name="edit_btn" top="0" - width="80" /> + width="90" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 686faab8eb..1074dd4627 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -2,79 +2,82 @@ <panel bevel_style="none" follows="top|left|right" - height="120" + height="85" layout="topleft" left="0" name="picture_item" top="0" - width="305"> + width="313"> <icon - follows="top|bottom|left|right" - height="120" + follows="all" + height="85" image_name="ListItem_Over" - left="0" + right="-3" mouse_opaque="false" name="hovered_icon" - top="0" + top="1" scale_image="true" visible="false" - width="305"/> + width="307"/> <icon - follows="top|bottom|left|right" - height="120" + follows="all" + height="85" image_name="ListItem_Select" - left="0" + right="-3" mouse_opaque="false" name="selected_icon" - top="0" + top="1" scale_image="true" visible="false" - width="305"/> + width="307"/> <texture_picker allow_no_texture="true" - default_image_name="None" + border_enabled="true" + default_image_name="TabIcon_Places_Large" enabled="false" follows="left|top" - height="120" + height="80" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="picture" tab_stop="false" - top="5" - top_pad="5" - width="120" /> + top="10" + top_pad="10" + width="90" /> <text follows="top|left|right" + font="SansSerifSmallBold" height="16" layout="topleft" - left="135" + left="110" name="picture_name" text_color="white" - top="5" - use_ellipses="true" - width="130" - word_wrap="true" /> + top="9" + use_ellipses="false" + width="197" + word_wrap="false" /> <text follows="top|left|right" - height="75" + font="SansSerifSmall" + height="40" layout="topleft" - left="135" + left="110" name="picture_descr" - top_pad="10" - use_ellipses="true" - width="130" + top_pad="3" + width="178" word_wrap="true" /> <button follows="top|right" height="16" - image_selected="Info_Press" - image_unselected="Info_Off" + image_selected="BuyArrow_Press" + image_pressed="BuyArrow_Press" + image_unselected="BuyArrow_Press" layout="topleft" name="info_chevron" picture_style="true" - right="290" + right="-7" tab_stop="false" - top="5" + top="27" width="16" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 2869ec78f4..ac2cf19a96 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -54,7 +54,7 @@ left_pad="15" name="new_btn" picture_style="true" - tool_tip="Create New Pick at Current Location" + tool_tip="Create new pick at current location" top="5" width="18" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index ba933683e3..a32be90a33 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -36,10 +36,12 @@ name="profile_scroll" reserve_scroll_corner="true" opaque="true" - top="0"> + top="0" + width="313"> <panel name="scroll_content_panel" follows="left|top|right" + height="485" layout="topleft" top="0" left="0" @@ -51,7 +53,7 @@ left="10" name="second_life_image_panel" top="0" - width="285"> + width="290"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -76,8 +78,9 @@ width="170" /> <expandable_text follows="left|top|right" - height="90" + height="95" layout="topleft" + left="107" name="sl_description_edit" width="173" expanded_bg_visible="true" @@ -92,7 +95,7 @@ top_pad="10" left="10" name="first_life_image_panel" - width="285"> + width="290"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -116,10 +119,11 @@ width="173" /> <expandable_text follows="left|top|right" - height="90" + height="95" layout="topleft" + left="107" name="fl_description_edit" - width="170" + width="173" expanded_bg_visible="true" expanded_bg_color="DkGray"> Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. @@ -265,7 +269,8 @@ name="profile_buttons_panel" top_pad="2" bottom="10" - height="19"> + height="19" + width="313"> <button follows="bottom|left" height="19" @@ -319,12 +324,14 @@ follows="bottom|left" layout="topleft" left="0" + top_pad="-17" name="profile_me_buttons_panel" - top_pad="-3" visible="false" - height="19"> + height="19" + width="313"> <button follows="bottom|right" + font="SansSerifSmall" height="19" left="10" label="Edit Profile" diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml index 78e5678455..25e1171688 100644 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml @@ -162,7 +162,7 @@ layout="topleft" left_delta="60" name="return_scripts" - tool_tip="Return only objects which have scripts." + tool_tip="Return only objects which have scripts" top_delta="0" width="80" /> <check_box 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 afcefcbd3b..c7a60ed2e4 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -180,7 +180,7 @@ regions in the estate. layout="topleft" left_delta="0" name="limit_payment" - tool_tip="Ban unidentified residents." + tool_tip="Ban unidentified residents" top_pad="2" width="278" /> <check_box diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml index 4d91a544c3..c8703aa895 100644 --- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml @@ -4,12 +4,12 @@ height="25" layout="topleft" name="panel_stand_stop_flying" - mouse_opaque="false" - visible="false" + mouse_opaque="false" + visible="false" width="115"> <button follows="left|bottom" - height="20" + height="19" label="Stand" layout="topleft" name="stand_btn" @@ -19,11 +19,11 @@ width="115" /> <button follows="left|bottom" - height="20" + height="19" label="Stop Flying" layout="topleft" name="stop_fly_btn" - tool_tip="Stop Flying" + tool_tip="Stop flying" top="2" visible="false" width="115" /> diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index fc61ce9683..795e0ffc0d 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -68,7 +68,7 @@ left_pad="20" name="TimeText" text_color="TimeTextColor" - tool_tip="Current Time (Pacific)" + tool_tip="Current time (Pacific)" width="80"> 12:00 AM </text> @@ -82,7 +82,7 @@ name="scriptout" picture_style="true" scale_image="false" - tool_tip="Script Warnings and Errors" + tool_tip="Script warnings and errors" top="0" visible="false" width="16" /> @@ -140,7 +140,7 @@ name="no_build" picture_style="true" scale_image="false" - tool_tip="Building/Rezzing not allowed" + tool_tip="Building/rezzing not allowed" top="0" visible="false" width="16" /> @@ -168,7 +168,7 @@ name="restrictpush" picture_style="true" scale_image="false" - tool_tip="No Pushing" + tool_tip="No pushing" top="0" visible="false" width="16" /> diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index b0cd75117f..4169c6245b 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,15 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="Teleport History" bottom="0" height="326" left="0" width="380" border="true" follows="left|top|right|bottom"> - <string - name="cant_create_lm_here" - value="Please teleport to selected location before creating Landmark. " /> - <string - name="create_landmark" - value="Create Landmark" /> - <string - name="open_landmark" - value="Open Landmark panel" /> <accordion follows="left|top|right|bottom" height="300" @@ -188,19 +179,5 @@ picture_style="true" top="5" width="18" /> - <button - follows="bottom|left" - font="SansSerifBigBold" - height="18" - image_selected="Favorite_Star_Active" - image_disabled="Favorite_Star_Off" - image_unselected="Favorite_Star_Press" - layout="topleft" - left_pad="5" - name="star_btn" - picture_style="true" - tool_tip="" - top_delta="0" - width="18" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2a616d8e2f..d13f5dbde3 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1951,6 +1951,10 @@ this texture in your inventory <string name="AgeDaysA">[COUNT] day</string> <string name="AgeDaysB">[COUNT] days</string> <string name="AgeDaysC">[COUNT] days</string> + <!-- Group member counts --> + <string name="GroupMembersA">[COUNT] member</string> + <string name="GroupMembersB">[COUNT] members</string> + <string name="GroupMembersC">[COUNT] members</string> <!-- Account types, see LLAvatarPropertiesProcessor --> <string name="AcctTypeResident">Resident</string> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 3e7e07749a..5bb48ef5aa 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -11,6 +11,7 @@ image_color="ButtonImageColor" image_color_disabled="ButtonImageColor" flash_color="ButtonFlashBgColor" + font="SansSerifSmall" hover_glow_amount="0.15" halign="center" scale_image="true"> diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml new file mode 100644 index 0000000000..b72d59524e --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<chat_history + message_header="panel_chat_header.xml" + message_separator="panel_chat_separator.xml" + left_text_pad="10" + right_text_pad="15" + left_widget_pad="5" + rigth_widget_pad="10" + max_length="2147483647" + enabled="false" + track_bottom="true" + name="chat_history" + type="string" + word_wrap="true" />
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index 8b23b72c2d..9ed3749308 100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml @@ -15,7 +15,7 @@ label="" hover_glow_amount="0.15" font="SansSerifSmall" - scale_image="false" + scale_image="true" pad_right="24" image_unselected="DropDown_Off" image_selected="DropDown_Selected" 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 d86103aedc..40c8dc860d 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -46,7 +46,7 @@ <combo_button name="Location History" label="" pad_right="0" - tool_tip="My Location History"/> + tool_tip="My location history"/> <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10" scroll_bar_bg_visible="true" /> <combo_editor name="Combo Text Entry" diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml index a054b4ee60..769af42e38 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml @@ -13,7 +13,7 @@ <combo_editor name="child1" select_on_focus="true" - text_pad_left="20" + text_pad_left="28" tool_tip="Search" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" @@ -24,9 +24,9 @@ page_lines="10" scroll_bar_bg_visible="true" /> <search_button label="" + top_pad="5" + left_pad="10" name="child3" - top_pad="4" - left_pad="4" width="13" height="13" tool_tip="Search" |