diff options
Diffstat (limited to 'indra/newview/skins')
37 files changed, 1300 insertions, 911 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index da1cd59619..7e22e17188 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -94,7 +94,7 @@ value="0.58 0.66 0.84 1" /> <color name="AvatarNameColor" - value="0.98 0.69 0.36 1" /> + reference="White" /> <color name="BackgroundChatColor" reference="DkGray_66" /> @@ -253,7 +253,7 @@ reference="White_10" /> <color name="DefaultHighlightLight" - reference="White_25" /> + reference="White_25" /> <color name="DefaultShadowDark" reference="Black_50" /> @@ -493,7 +493,7 @@ value="0 0.78 0.78 1" /> <color name="NotifyBoxColor" - value="0.27 0.67 1 1" /> + value="LtGray" /> <color name="NotifyCautionBoxColor" value="1 0.82 0.46 1" /> @@ -625,7 +625,7 @@ reference="Black" /> <color name="TextDefaultColor" - value="0 0 0 .33" /> + value="Black" /> <color name="TextEmbeddedItemColor" value="0 0 0.5 1" /> @@ -643,16 +643,16 @@ value="0 0 0 .33" /> <color name="TimeTextColor" - reference="LtGray" /> + reference="LtGray_50" /> <color name="TitleBarFocusColor" reference="White_10" /> <color name="ToolTipBgColor" - value="0 0 0 .75" /> + value="DkGray" /> <color name="ToolTipBorderColor" - value="0 0 0 .75" /> + value="White_50" /> <color name="ToolTipTextColor" reference="LtGray" /> diff --git a/indra/newview/skins/default/html/en-us/help-offline/index.html b/indra/newview/skins/default/html/en-us/help-offline/index.html new file mode 100644 index 0000000000..bf3677603e --- /dev/null +++ b/indra/newview/skins/default/html/en-us/help-offline/index.html @@ -0,0 +1,29 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title>Offline Help</title> +<style> +body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;} +a {color:#93a9d5;} +a:active {color:#50607C;text-decoration:underline;} +a:hover {color:#ff7900;text-decoration:underline;} +#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;} +#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;} +#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;} +#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;} +#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;} +#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;} +</style> +</head> +<body> +<div id="infobox"> + <p> + Second Life Offline Help. + </p> + <p> + You are not online and are configured not to fetch help remotely. This is all the help that is available + until more stuff is done. Yeah. + </p> + </div> +</div> +</body> diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 46c294768d..8a6e9486a2 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -110,12 +110,10 @@ <texture name="Home_Off" file_name="navbar/Home_Off.png" preload="false" /> <texture name="Home_Press" file_name="navbar/Home_Press.png" preload="false" /> - <texture name="Icon_Close_Background" file_name="windows/Icon_Close_Background.png" preload="true" /> <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" /> <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" /> <texture name="Icon_Close_Toast" file_name="windows/Icon_Close_Toast.png" preload="true" /> - <texture name="Icon_Dock_Background" file_name="windows/Icon_Dock_Background.png" preload="true" /> <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" /> <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" /> @@ -125,16 +123,16 @@ <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" /> <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="false" /> - <texture name="Icon_Help_Background" file_name="windows/Icon_Help_Background.png" preload="false" /> <texture name="Icon_Help_Foreground" file_name="windows/Icon_Help_Foreground.png" preload="false" /> <texture name="Icon_Help_Press" file_name="windows/Icon_Help_Press.png" preload="false" /> <texture name="Icon_Info" file_name="windows/Icon_Info.png" preload="false" /> - <texture name="Icon_Minimize_Background" file_name="windows/Icon_Minimize_Background.png" preload="true" /> <texture name="Icon_Minimize_Foreground" file_name="windows/Icon_Minimize_Foreground.png" preload="true" /> <texture name="Icon_Minimize_Press" file_name="windows/Icon_Minimize_Press.png" preload="true" /> - <texture name="Icon_Undock_Background" file_name="windows/Icon_Undock_Background.png" preload="false" /> + <texture name="Icon_Restore_Foreground" file_name="windows/Icon_Restore_Foreground.png" preload="false" /> + <texture name="Icon_Restore_Press" file_name="windows/Icon_Restore_Press.png" preload="false" /> + <texture name="Icon_Undock_Foreground" file_name="windows/Icon_Undock_Foreground.png" preload="false" /> <texture name="Icon_Undock_Press" file_name="windows/Icon_Undock_Press.png" preload="false" /> @@ -175,6 +173,9 @@ <texture name="Inv_Underpants" file_name="icons/Inv_Underpants.png" preload="false" /> <texture name="Inv_Undershirt" file_name="icons/Inv_Undershirt.png" preload="false" /> + <texture name="Linden_Dollar_Alert" file_name="widgets/Linden_Dollar_Alert.png"/> + <texture name="Linden_Dollar_Background" file_name="widgets/Linden_Dollar_Background.png"/> + <texture name="ListItem_Select" file_name="widgets/ListItem_Select.png" preload="true" /> <texture name="ListItem_Over" file_name="widgets/ListItem_Over.png" preload="true" /> @@ -442,8 +443,6 @@ <texture name="cam_zoom_plus_in.tga" preload="false" /> <texture name="cam_zoom_minus_in.tga" preload="false" /> - <texture name="close_inactive_blue.tga" /> - <texture name="closebox.tga" /> <texture name="icn_clear_lineeditor.tga" /> <texture name="icn_chatbar.tga" /> @@ -493,10 +492,6 @@ <texture name="up_arrow.tga" file_name="up_arrow.png" /> <texture name="down_arrow.tga" file_name="down_arrow.png" /> - <texture name="restore_inactive.tga" /> - <texture name="restore.tga" /> - <texture name="restore_pressed.tga" /> - <texture name="tearoffbox.tga" /> <texture name="tearoff_pressed.tga" /> diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png Binary files differnew file mode 100644 index 0000000000..a1f21e8194 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png Binary files differnew file mode 100644 index 0000000000..a1d602f6f0 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png Binary files differnew file mode 100644 index 0000000000..1e753aaf1d --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png Binary files differnew file mode 100644 index 0000000000..be66b05230 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 97afe6d324..c9e143bf95 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -3,6 +3,7 @@ height="440" layout="topleft" name="floater_about" + help_topic="floater_about" save_rect="true" title="About [APP_NAME]" width="470"> 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 52c7944ba9..991c9a84a3 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -1,296 +1,291 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <floater can_minimize="false" - height="270" + height="275" layout="topleft" name="buy currency" - help_topic="buy_currency" + help_topic="buy_linden_dollars" single_instance="true" - title="Buy Currency" + title="Buy L$" width="350"> <floater.string name="buy_currency"> - Buy L$ [LINDENS] for approx. US$ [USD] + Buy L$ [LINDENS] for approx. [LOCALAMOUNT] </floater.string> - <text + <floater.string + name="account_website"> + http://secondlife.com/account/billing.php + </floater.string> + <icon + height="215" + image_name="Linden_Dollar_Background" + layout="topleft" + left="0" + name="normal_background" + top="17" + width="350" /> + <text type="string" length="1" - bottom_delta="48" follows="top|left" font="SansSerifHuge" - height="24" layout="topleft" - left="16" - name="info_buying" - right="-20"> - Buying Currency: + left="20" + height="30" + top="30" + width="300" + name="info_need_more"> + You need more L$: </text> <text type="string" length="1" - bottom_delta="0" follows="top|left" - font="SansSerifHuge" - height="24" + height="16" layout="topleft" - left="16" - name="info_cannot_buy" - right="-20"> - Cannot buy now: + left="20" + width="300" + name="contacting"> + Contacting LindeX... </text> <text type="string" length="1" - bottom_delta="0" follows="top|left" font="SansSerifHuge" - height="24" layout="topleft" - left="16" - name="info_need_more" - right="-20"> - You need more currency: + left="20" + height="30" + top="30" + width="200" + name="info_buying"> + Buy L$ </text> - <icon - follows="top|left" - height="64" - image_name="badge_note.j2c" - layout="topleft" - left="0" - name="step_error" - top="48" - width="64" /> <text type="string" length="1" - bottom_delta="96" - follows="top|left" - height="140" - layout="topleft" - left="72" - name="error_message" - right="-20"> - Something ain't right. - </text> - <button - follows="bottom|left" - height="20" - label="Go to website" - layout="topleft" - left_delta="0" - name="error_web" - top_delta="124" - width="120" /> - <icon - follows="top|left" - height="64" - image_name="badge_note.j2c" - layout="topleft" - left="0" - name="step_1" - top="48" - width="64" /> - <text - type="string" - length="1" - bottom_delta="-38" follows="top|left" + font="SansSerifMedium" height="16" layout="topleft" - left="72" - name="contacting" - right="-20"> - Contacting LindeX... + left="20" + name="balance_label" + top_pad="10" + width="210"> + I have </text> <text type="string" length="1" - bottom_delta="0" + font="SansSerifMedium" follows="top|left" + halign="right" height="16" layout="topleft" - left="72" - name="buy_action_unknown" - right="-20"> - Buy L$ on the LindeX currency exchange + left="200" + name="balance_amount" + top_delta="0" + width="100"> + L$ [AMT] </text> <text type="string" length="1" - bottom_delta="0" follows="top|left" + font="SansSerifMedium" height="16" + top_pad="15" layout="topleft" - left="72" - name="buy_action" - right="-20"> - [NAME] L$ [PRICE] + left="20" + name="currency_action" + width="210"> + I want to buy </text> <text + font="SansSerifMedium" type="string" length="1" - follows="top|left" + follows="left|top" height="16" layout="topleft" - left_delta="0" - name="currency_action" - top_pad="4" - width="40"> - Buy L$ + top_delta="0" + left="222" + name="currency_label" + width="15"> + L$ </text> <line_editor type="string" - length="1" - follows="top|right" - height="16" - layout="topleft" - left_pad="5" + halign="right" + font="SansSerifMedium" + select_on_focus="true" + follows="top|left" + top_delta="-7" + height="22" + label="L$" + left_pad="3" name="currency_amt" - top_delta="0" - width="80"> + width="60"> 1234 </line_editor> <text type="string" - length="1" - follows="top|right" - height="16" - layout="topleft" - left_pad="5" - name="currency_est" - top_delta="0" - width="180"> - for approx. US$ [USD,number,2] - </text> - <text - type="string" - length="1" - follows="top|right" - height="16" - layout="topleft" - left_delta="5" - name="getting_data" - top_delta="0" - width="180"> - Getting data... - </text> - <text - type="string" + font="SansSerifMedium" length="1" follows="top|left" height="16" layout="topleft" - left="80" - name="balance_label" - top="110" - width="240"> - You currently have + left="20" + top_pad="10" + name="buying_label" + width="210"> + For the price </text> <text type="string" length="1" + font="SansSerifMedium" + text_color="EmphasisColor" follows="top|left" halign="right" height="16" - layout="topleft" - left_delta="0" - name="balance_amount" top_delta="0" - width="240"> - L$ [AMT] + layout="topleft" + left="170" + name="currency_est" + width="130"> + [LOCALAMOUNT] </text> <text type="string" + font="SansSerifSmall" + text_color="EmphasisColor" length="1" follows="top|left" height="16" layout="topleft" - left_delta="0" - name="buying_label" - top_pad="4" - width="240"> - You are buying + left="40" + width="100" + halign="right" + name="getting_data"> + Estimating... </text> <text type="string" + font="SansSerifSmall" + top_delta="0" length="1" follows="top|left" halign="right" height="16" + left_pad="10" + width="150" layout="topleft" - left_delta="0" - name="buying_amount" - top_delta="0" - width="240"> - L$ [AMT] + name="buy_action"> + [NAME] L$ [PRICE] </text> <text type="string" + font="SansSerifMedium" length="1" follows="top|left" height="16" layout="topleft" - left_delta="0" + left="20" name="total_label" - top_pad="4" - width="240"> - Your balance will be + width="210"> + My new balance will be </text> <text type="string" length="1" + font="SansSerifMedium" follows="top|left" - halign="right" + top_delta="0" height="16" layout="topleft" - left_delta="0" + left="200" + halign="right" name="total_amount" - top_delta="0" - width="240"> + width="100"> L$ [AMT] </text> <text type="string" length="1" - bottom_delta="48" follows="top|left" - height="32" layout="topleft" - left="72" - name="purchase_warning_repurchase" - right="-20"> - Confirming this purchase only buys the currency. -You'll need to try the operation again. + left="20" + width="300" + name="purchase_warning_repurchase"> + Confirming this purchase only buys the L$. +You'll need to try again. </text> <text type="string" length="1" - bottom_delta="0" follows="top|left" - height="32" layout="topleft" - left="72" - name="purchase_warning_notenough" - right="-20"> - You aren't buying enough currency + left="20" + name="purchase_warning_notenough"> + You aren't buying enough L$. Increase the amount to buy. </text> + + <button + follows="bottom|left" + height="20" + label="Buy Now" + layout="topleft" + left="151" + name="buy_btn" + top="248" + width="90"/> <button follows="bottom|right" height="20" label="Cancel" layout="topleft" - left="237" + left_pad="10" name="cancel_btn" - top="234" - width="90" /> - <button - follows="bottom|left" - height="20" - label="Purchase" + width="90"/> + <icon + height="215" + image_name="Linden_Dollar_Alert" layout="topleft" - left_delta="-96" - name="buy_btn" - top_delta="0" - width="90" /> + left="0" + name="error_background" + top="15" + width="350"/> + <text + type="string" + font="SansSerifHuge" + left="170" + width="170" + height="80" + top="30" + name="info_cannot_buy"> + Take your +[SECOND_LIFE] to +the next level... + </text> + <button + follows="bottom|left" + height="20" + label="Continue to the Web" + layout="topleft" + left="170" + name="error_web" + top="120" + width="160"/> + <text + type="string" + width="350" + height="20" + top_pad="92" + left_pad="-300" + follows="bottom|right" + name="cannot_buy_message"> + Continue to the web site and enter payment information + </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index a1265d49f9..512b4c85a1 100644 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_resize="true" - height="440" + height="400" layout="topleft" min_height="140" min_width="467" @@ -9,8 +9,8 @@ help_topic="floater_help_browser" save_rect="true" single_instance="true" - title="Holy Bananas, it's the Help Browser" - width="820"> + title="Help Browser" + width="620"> <floater.string name="home_page_url"> http://www.secondlife.com @@ -20,150 +20,13 @@ http://support.secondlife.com </floater.string> <layout_stack - bottom="440" + bottom="400" follows="left|right|top|bottom" layout="topleft" left="10" name="stack1" top="20" - width="800"> - <layout_panel - auto_resize="false" - height="20" - layout="topleft" - left="0" - name="nav_controls" - top="400" - user_resize="false" - width="800"> - <button - follows="left|top" - height="20" - label="Back" - layout="topleft" - left="0" - name="back" - top="0" - width="55" /> - <button - follows="left|top" - height="20" - label="Forward" - layout="topleft" - left_pad="3" - name="forward" - top_delta="0" - width="68" /> - <button - enabled="false" - follows="left|top" - height="20" - label="Reload" - layout="topleft" - left_pad="2" - name="reload" - top_delta="0" - width="70"/> - <combo_box - allow_text_entry="true" - follows="left|top|right" - height="20" - layout="topleft" - left_pad="5" - max_chars="255" - name="address" - top_delta="0" - width="540" /> - <button - enabled="false" - follows="right|top" - height="20" - label="Go" - layout="topleft" - left_pad="5" - name="go" - top_delta="0" - width="55" /> - </layout_panel> - <layout_panel - auto_resize="false" - height="20" - layout="topleft" - left_delta="0" - name="time_controls" - top_delta="0" - user_resize="false" - width="800"> - <button - follows="left|top" - height="20" - label="rewind" - layout="topleft" - left="0" - name="rewind" - top="0" - width="55" /> - <button - follows="left|top" - height="20" - image_selected="button_anim_play_selected.tga" - image_unselected="button_anim_play.tga" - layout="topleft" - left_delta="55" - name="play" - picture_style="true" - top_delta="0" - width="55" /> - <button - follows="left|top" - height="20" - image_selected="button_anim_pause_selected.tga" - image_unselected="button_anim_pause.tga" - layout="topleft" - left_delta="0" - name="pause" - picture_style="true" - top_delta="0" - width="55" /> - <button - follows="left|top" - height="20" - label="stop" - layout="topleft" - left_pad="10" - name="stop" - top_delta="0" - width="55" /> - <button - follows="left|top" - height="20" - label="forward" - layout="topleft" - left_pad="20" - name="seek" - top_delta="0" - width="55" /> - </layout_panel> - <layout_panel - auto_resize="false" - height="20" - layout="topleft" - left_delta="0" - name="parcel_owner_controls" - top_delta="0" - user_resize="false" - width="540"> - <button - enabled="false" - follows="left|top" - height="20" - label="Send Current URL to Parcel" - layout="topleft" - left="0" - name="assign" - top="0" - width="200" /> - </layout_panel> + width="600"> <layout_panel height="20" layout="topleft" @@ -171,7 +34,7 @@ name="external_controls" top_delta="0" user_resize="false" - width="540"> + width="570"> <web_browser bottom="-10" follows="left|right|top|bottom" @@ -179,7 +42,7 @@ left="0" name="browser" top="0" - width="540" /> + width="570" /> <button follows="bottom|left" height="20" @@ -189,25 +52,17 @@ name="open_browser" top_pad="5" width="185" /> - <check_box - control_name="UseExternalBrowser" - follows="bottom|left" - height="20" - label="Always open in my web browser" - layout="topleft" - left_pad="5" - name="open_always" - top_delta="0" - width="200" /> +<!-- <button follows="bottom|right" height="20" label="Close" layout="topleft" - left_pad="80" + left_pad="290" name="close" top_delta="0" width="70" /> +--> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml new file mode 100644 index 0000000000..6ba26f938d --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater bottom="-666" can_close="true" can_drag_on_left="false" can_minimize="true" + can_resize="false" can_tear_off="true" default_tab_group="1" enabled="true" + width="365" height="535" left="330" min_height="430" min_width="620" + mouse_opaque="true" name="Medis Settings" title="Media Settings"> + <button bottom="-525" enabled="true" follows="right|bottom" font="SansSerif" + halign="center" height="20" label="OK" label_selected="OK" left="75" + mouse_opaque="true" name="OK" scale_image="true" width="90" /> + <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif" + halign="center" height="20" label="Cancel" label_selected="Cancel" + left_delta="93" mouse_opaque="true" name="Cancel" scale_image="true" + width="90" /> + <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif" + halign="center" height="20" label="Apply" label_selected="Apply" + left_delta="93" mouse_opaque="true" name="Apply" scale_image="true" + width="90" /> + <tab_container bottom="-500" enabled="true" follows="left|top|right|bottom" height="485" + left="0" mouse_opaque="false" name="tab_container" tab_group="1" + tab_position="top" tab_width="80" width="365" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml index 30406cad63..aef5707fd4 100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -12,7 +12,7 @@ width="320" min_width="320" height="23" - can_minimize="false" + can_minimize="true" can_tear_off="false" can_resize="false" can_drag_on_left="false" @@ -22,10 +22,10 @@ <flat_list_view color="FloaterDefaultBackgroundColor" follows="all" - layout="topleft" - name="notification_list" - left="1" + layout="topleft" + name="notification_list" + left="1" top="20" - height="0" - width="318"/> + height="0" + width="318"/> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index edbd28cd2d..053215f8ae 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -74,7 +74,11 @@ name="button focus" picture_style="true" tool_tip="Focus" - width="20" /> + width="20"> + <button.commit_callback + function="BuildTool.setTool" + parameter="Focus" /> + </button> <button follows="left|top" height="20" @@ -87,7 +91,11 @@ name="button move" picture_style="true" tool_tip="Move" - width="20" /> + width="20"> + <button.commit_callback + function="BuildTool.setTool" + parameter="Move" /> + </button> <button follows="left|top" height="20" @@ -100,7 +108,11 @@ name="button edit" picture_style="true" tool_tip="Edit" - width="20" /> + width="20"> + <button.commit_callback + function="BuildTool.setTool" + parameter="Edit" /> + </button> <button follows="left|top" height="20" @@ -113,7 +125,11 @@ name="button create" picture_style="true" tool_tip="Create" - width="20" /> + width="20"> + <button.commit_callback + function="BuildTool.setTool" + parameter="Create" /> + </button> <button follows="left|top" height="20" @@ -126,7 +142,11 @@ name="button land" picture_style="true" tool_tip="Land" - width="20" /> + width="20"> + <button.commit_callback + function="BuildTool.setTool" + parameter="Land" /> + </button> <text type="string" text_color="LabelSelectedDisabledColor" @@ -160,6 +180,8 @@ label="Pan (Ctrl-Shift)" layout="topleft" name="radio pan" /> + <radio_group.commit_callback + function="BuildTool.commitRadioFocus"/> </radio_group> <slider_bar follows="left|top" @@ -171,7 +193,10 @@ top_delta="-2" left_delta="100" name="slider zoom" - width="134" /> + width="134"> + <slider_bar.commit_callback + function="BuildTool.commitZoom"/> + </slider_bar> <radio_group left="10" height="70" @@ -193,6 +218,8 @@ label="Spin (Ctrl-Shift)" layout="topleft" name="radio spin" /> + <radio_group.commit_callback + function="BuildTool.commitRadioMove"/> </radio_group> <radio_group follows="left|top" @@ -220,6 +247,8 @@ label="Select Texture" layout="topleft" name="radio select face" /> + <radio_group.commit_callback + function="BuildTool.commitRadioEdit"/> </radio_group> <check_box left="10" @@ -227,7 +256,10 @@ control_name="EditLinkedParts" label="Edit linked" layout="topleft" - name="checkbox edit linked parts" /> + name="checkbox edit linked parts" > + <check_box.commit_callback + function="BuildTool.selectComponent"/> + </check_box> <combo_box height="19" left="10" @@ -248,6 +280,8 @@ label="Reference ruler" name="Reference" value="Reference" /> + <combo_box.commit_callback + function="BuildTool.gridMode"/> </combo_box> <check_box control_name="ScaleUniform" @@ -286,7 +320,10 @@ name="Options..." tool_tip="Set the Grid Options" width="26" - height="22" /> + height="22" > + <button.commit_callback + function="BuildTool.gridOptions"/> + </button> <button follows="left|top" height="20" @@ -597,8 +634,9 @@ name="radio revert" top_delta="15" width="114" /> + <radio_group.commit_callback + function="BuildTool.commitRadioLand"/> </radio_group> - <text type="string" length="1" @@ -624,6 +662,7 @@ Size </text> <slider_bar + control_name ="LandBrushSize" follows="left|top" height="19" initial_value="2.0" @@ -656,7 +695,10 @@ min_val="-1" name="slider force" top_delta="-3" - width="80" /> + width="80" > + <slider_bar.commit_callback + function="BuildTool.LandBrushForce"/> + </slider_bar> <button follows="left|top" font="SansSerifSmall" @@ -668,7 +710,10 @@ left="135" name="button apply to selection" tool_tip="Modify Selected Land" - width="78" /> + width="78"> + <button.commit_callback + function="BuildTool.applyToSelection"/> + </button> <text type="string" text_color="LabelSelectedDisabledColor" @@ -2215,7 +2260,7 @@ left="10" name="texture control" tool_tip="Click to choose a picture" - top="10" + top="8" width="64" /> <color_swatch border_color="0.45098 0.517647 0.607843 1" @@ -2237,7 +2282,7 @@ layout="topleft" left_pad="20" name="color trans" - top="10" + top="6" width="100"> Transparency % </text> @@ -2261,7 +2306,7 @@ layout="topleft" left_delta="0" name="glow label" - top_pad="4" + top_pad="2" width="80"> Glow </text> @@ -2281,7 +2326,7 @@ layout="topleft" left_delta="0" name="checkbox fullbright" - top_pad="7" + top_pad="4" width="81" /> <text type="string" @@ -2291,7 +2336,7 @@ layout="topleft" left="10" name="tex gen" - top_pad="10" + top_pad="5" width="87"> Mapping </text> @@ -2439,6 +2484,40 @@ name="weave" value="weave" /> </combo_box> + <!-- + <line_editor + bevel_style="in" + border_style="line" + border_thickness="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + max_length="63" + name="Home Url" + select_on_focus="true" + top="134" + width="250" /> + <check_box + height="16" + label="Media Face" + layout="topleft" + left_delta="0" + name="has media" + top_pad="6" + width="70" /> + <button + follows="left|top" + font="SansSerifSmall" + height="20" + label="Set Media Info" + label_selected="Set Media Info" + layout="topleft" + left_pad="60" + name="media info set" + top_delta="-4" + width="120" /> +--> <text type="string" length="1" @@ -2447,7 +2526,7 @@ layout="topleft" left="10" name="tex scale" - top_pad="15" + top_pad="5" width="200"> Repeats per Face </text> @@ -2461,7 +2540,7 @@ left="20" max_val="100" name="TexScaleU" - top_pad="10" + top_pad="6" width="160" /> <check_box height="19" @@ -2469,7 +2548,7 @@ layout="topleft" left_pad="10" name="checkbox flip s" - top_delta="1" + top_delta="0" width="70" /> <spinner follows="left|top" @@ -2489,61 +2568,43 @@ layout="topleft" left_pad="10" name="checkbox flip t" - top_delta="1" + top_delta="0" width="70" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="tex rotate" - top_pad="20" - width="102"> - Rotation (degrees) - </text> + <spinner decimal_digits="2" follows="left|top" height="19" increment="1" initial_value="0" + label="Rotation (degrees)" layout="topleft" - left_delta="102" + label_width="100" + left="10" max_val="9999" min_val="-9999" name="TexRot" - top_delta="0" - width="68" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="rpt" - top_pad="0" - width="160"> - Repeats Per Meter - </text> + top_delta="25" + width="170" /> + <spinner decimal_digits="1" follows="left|top" height="19" initial_value="1" + label="Repeats Per Meter" layout="topleft" - left_delta="102" + label_width="100" + left="10" max_val="10" min_val="0.1" name="rptctrl" - top_delta="0" - width="68" /> + top_delta="20" + width="170" /> <button follows="left|top" font="SansSerifSmall" - height="22" + height="18" label="Apply" label_selected="Apply" layout="topleft" @@ -2558,7 +2619,7 @@ layout="topleft" left="10" name="tex offset" - top_pad="20" + top_delta="20" width="200"> Texture Offset </text> @@ -2572,7 +2633,7 @@ left="20" min_val="-1" name="TexOffsetU" - top_pad="10" + top_pad="5" width="160" /> <spinner follows="left|top" @@ -2584,10 +2645,9 @@ left_delta="0" min_val="-1" name="TexOffsetV" - top_pad="2" + top_pad="1" width="160" /> -<!--TODO: KILL THIS--> - <!-- <text + <text type="string" length="1" follows="left|top" @@ -2595,7 +2655,7 @@ layout="topleft" left="10" name="textbox autofix" - top="332" + top_pad="4" width="160"> Align media texture (must load first) @@ -2607,10 +2667,75 @@ label="Align" label_selected="Align" layout="topleft" - left="112" + left="122" name="button align" - top="340" - width="68" />--> + 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: + </text> + <line_editor + follows="left|top|right" + height="18" + layout="topleft" + left="20" + max_length="63" + 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"> + <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" > + <button.commit_callback + function="BuildTool.DeleteMedia"/> + </button> + <button + follows="left|top" + font="SansSerifSmall" + height="15" + width="15" + image_unselected="gear.tga" + label="" + layout="topleft" + name="edit_media" + top_delta="0" + left_delta="190"> + <button.commit_callback + function="BuildTool.EditMedia"/> + </button> </panel> <panel border="false" @@ -2642,13 +2767,13 @@ width="130" /> <panel_inventory follows="left|top" - height="310" + height="210" layout="topleft" left="10" name="contents_inventory" top="50" width="260" /> - </panel> + </panel> </tab_container> <panel follows="left|top" diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml new file mode 100644 index 0000000000..0eb2c5e1be --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ height="108"
+ layout="topleft"
+ name="whitelist_entry"
+ width="390">
+
+ <text type="string" length="1" bottom="20" follows="top|left" height="15" layout="topleft"
+ left="10" name="media_label" top="20">
+ Enter a URL or URL pattern to add to the list of allowed domains
+ </text>
+
+ <line_editor bottom_delta="40" enabled="true" follows="left|top" font="SansSerif"
+ height="20" left="10" name="whitelist_entry"
+ tool_tip="Enter a URL or URL pattern to White List"
+ width="350" />
+
+ <button follows="top|left" height="20" font="SansSerifSmall" label="OK"
+ layout="topleft" left="10" name="ok_btn" bottom_delta="28" width="64" />
+
+ <button follows="top|left" height="20" font="SansSerifSmall" label="Cancel"
+ layout="topleft" left_pad="5" name="cancel_btn" bottom_delta="0" width="64" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml new file mode 100644 index 0000000000..d9cba27b88 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Teleport History Item Context Menu"> + <menu_item_call + label="Teleport" + layout="topleft" + name="Teleport"> + <menu_item_call.on_click + function="TeleportHistory.Teleport" /> + </menu_item_call> + <menu_item_call + label="More Information" + layout="topleft" + name="More Information"> + <menu_item_call.on_click + function="TeleportHistory.MoreInformation" /> + </menu_item_call> + <menu_item_call + label="Copy" + layout="topleft" + name="Copy"> + <menu_item_call.on_click + function="TeleportHistory.Copy" /> + </menu_item_call> + <menu_item_call + label="Make Landmark" + layout="topleft" + name="Make Landmark"> + <menu_item_call.on_click + function="TeleportHistory.MakeLandmark" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml new file mode 100644 index 0000000000..ecc1d8a954 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Teleport History Item Context Menu"> + <menu_item_call + label="Open" + layout="topleft" + name="TabOpen"> + <menu_item_call.on_click + function="TeleportHistory.TabOpen" /> + </menu_item_call> + <menu_item_call + label="Close" + layout="topleft" + name="TabClose"> + <menu_item_call.on_click + function="TeleportHistory.TabClose" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 10aa23b715..2c77f61da6 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -128,13 +128,13 @@ function="World.SetAway" /> </menu_item_call> <menu_item_separator - layout="topleft"/> + layout="topleft"/> <menu_item_call label="Set Busy" layout="topleft" name="Set Busy"> <menu_item_call.on_click - function="World.SetBusy"/> + function="World.SetBusy"/> </menu_item_call> </menu> <menu_item_separator @@ -1042,15 +1042,6 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Report Bug..." - layout="topleft" - name="ReportBug"> - <menu_item_call.on_click - function="PromptShowURL" - name="ReportBug_url" - parameter="hud,http://help.secondlife.com/en/bugreport/" /> - </menu_item_call> - <menu_item_call label="Report Abuse..." layout="topleft" name="Report Abuse"> @@ -2771,15 +2762,6 @@ function="Advanced.ShowDebugSettings" parameter="skin" /> </menu_item_call> - <menu_item_check - label="Editable UI" - layout="topleft" - name="Editable UI"> - <menu_item_check.on_check - function="Advanced.CheckEditableUI" /> - <menu_item_check.on_click - function="Advanced.ToggleEditableUI" /> - </menu_item_check> <menu_item_call label="Dump SelectMgr" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 044194a4ed..fe088b43be 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -646,6 +646,19 @@ This entire region is damage enabled. Scripts must be allowed to run for weapons to work. </notification> +<notification + icon="alertmodal.tga" + name="MultipleFacesSelected" + type="alertmodal"> + Multiple faces are currently selected. +If you continue this action, separate instances of media will be set on multiple faces of the object. +To place the media on only one face, choose Select Texture and click on the desired face of that object then click Add. + <usetemplate + name="okcancelignore" + notext="Cancel" + yestext="OK"/> + </notification> + <notification icon="alertmodal.tga" name="MustBeInParcel" @@ -783,6 +796,20 @@ There is no reimbursement for fees paid. yestext="OK"/> </notification> + +<notification + icon="alertmodal.tga" + name="DeleteMedia" + type="alertmodal"> +You have selected to delete the media associated with this face. +Are you sure you want to continue? + <usetemplate + ignoretext="Confirm before I delete media from an object" + name="okcancelignore" + notext="No" + yestext="Yes"/> + </notification> + <notification icon="alertmodal.tga" name="ClassifiedSave" @@ -1215,7 +1242,7 @@ Please move all objects to be acquired onto the same region. type="alertmodal"> [EXTRA] -Go to [_URL] for information on purchasing currency? +Go to [_URL] for information on purchasing L$? <url option="0" name="url"> http://secondlife.com/app/currency/ @@ -1691,7 +1718,6 @@ No Group selected. type="alertmodal"> Unable to deed land: Cannot find the region this land is in. -Please use Help > Report Bug to report this. </notification> <notification @@ -1772,8 +1798,6 @@ Parcels you own appear in green. type="alertmodal"> Unable to abandon land: Cannot find the region this land is in. - -Please use Help > Report Bug to report this. </notification> <notification @@ -1846,8 +1870,6 @@ Divide land? type="alertmodal"> Unable to divide land: Cannot find the region this land is in. - -Please use Help > Report Bug to report this. </notification> <notification @@ -1856,8 +1878,6 @@ Please use Help > Report Bug to report this. type="alertmodal"> Unable to join land: Cannot find the region this land is in. - -Please use Help > Report Bug to report this. </notification> <notification @@ -1973,8 +1993,6 @@ Unable to save '[NAME]' to wearable file. You will need to free up so type="alertmodal"> Unable to save [NAME] to central asset store. This is usually a temporary failure. Please customize and save the wearable again in a few minutes. - -If this problem persists, please click on Help > Report Bug and provide details about your network setup. </notification> <notification @@ -2758,18 +2776,6 @@ Go to secondlife.com to manage your account? <notification icon="alertmodal.tga" - name="WebLaunchBugReport101" - type="alertmodal"> -Visit the [SECOND_LIFE] Wiki and learn how to report bugs correctly. - <usetemplate - ignoretext="Launch my browser to learn how to report a Bug" - name="okcancelignore" - notext="Cancel" - yestext="OK"/> - </notification> - - <notification - icon="alertmodal.tga" name="WebLaunchSecurityIssues" type="alertmodal"> Visit the [SECOND_LIFE] Wiki for details of how to report a security issue. @@ -4275,22 +4281,6 @@ The resolution of this report applies only to this Region. Residents' acces <notification icon="alertmodal.tga" - name="HelpReportBug" - type="alertmodal"> -Use this tool to *only* report technical features that do not perform as described or expected, please provide as much detail as possible. -You may reply to the auto-response email to add more details to your report. - -All bug reports are investigated and assessed. No email response will be sent. - -If you are having a technical difficulty, please contact Support at: - -http://secondlife.com/community/support.php - -Note: Incomplete reports will not be investigated - </notification> - - <notification - icon="alertmodal.tga" name="HelpReportAbuseSelectCategory" type="alertmodal"> Please select a category for this abuse report. @@ -4299,14 +4289,6 @@ Selecting a category helps us file and process abuse reports. <notification icon="alertmodal.tga" - name="HelpReportBugSelectCategory" - type="alertmodal"> -Please select a category for this bug. -Selecting a category helps us file and process bug reports. - </notification> - - <notification - icon="alertmodal.tga" name="HelpReportAbuseAbuserNameEmpty" type="alertmodal"> Please enter the name of the abuser. @@ -4331,14 +4313,6 @@ Entering an accurate summary helps us file and process abuse reports. <notification icon="alertmodal.tga" - name="HelpReportBugSummaryEmpty" - type="alertmodal"> -Please enter a summary of the bug. -Entering an accurate summary helps us file and process bug reports. - </notification> - - <notification - icon="alertmodal.tga" name="HelpReportAbuseDetailsEmpty" type="alertmodal"> Please enter a detailed description of the abuse that took place. @@ -4348,15 +4322,6 @@ Entering an accurate description helps us file and process abuse reports. <notification icon="alertmodal.tga" - name="HelpReportBugDetailsEmpty" - type="alertmodal"> -Please enter a detailed description of the bug. -Be as specific as you can, including steps to reproduce the bug if possible. -Entering an accurate description helps us file and process bug reports. - </notification> - - <notification - icon="alertmodal.tga" name="HelpReportAbuseContainsCopyright" type="alertmodal"> Dear Resident, @@ -6547,6 +6512,17 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block Unable to find the help topic for this element. </notification> + <notification + icon="alertmodal.tga" + name="ObjectMediaFailure" + type="alertmodal"> +Server Error: Media update or get failed. +'[ERROR]' + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. </global> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 90b331a39f..cd7e340ff1 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -79,7 +79,6 @@ label="Move" layout="topleft" name="movement_btn" - tab_stop="false" tool_tip="Shows/Hide Movement controls" top="6" width="70"> @@ -117,7 +116,6 @@ label="View" layout="topleft" left="0" - tab_stop="false" tool_tip="Shows/Hide Camera controls" top="6" name="camera_btn" @@ -133,7 +131,6 @@ height="20" width="20" left_pad="0" - tab_stop="false" is_toggle="true" picture_style="true" image_selected="toggle_button_selected" 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 c4c8aa24c4..fb4ce436e8 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 @@ -28,7 +28,7 @@ width="25" height="25" label="" - follows="top|left" + follows="top|right" image_overlay="BackArrow_Off" tab_stop="false" /> <text @@ -41,6 +41,7 @@ text_color="white" follows="top|left|right" mouse_opaque="true" + use_ellipses="true" name="group_name">(Loading...)</text> <line_editor follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index e7fb3fa208..c96c296057 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -26,9 +26,8 @@ layout="topleft" left="0" name="login_html" - hide_loading="true" right="-1" - start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" + start_url="" top="1" /> <text type="string" @@ -52,7 +51,7 @@ max_length="31" name="first_name_edit" select_on_focus="true" - tool_tip="Second Life First Name" + tool_tip="[SECOND_LIFE] First Name" top_pad="2" width="120" /> <text @@ -78,6 +77,7 @@ max_length="31" name="last_name_edit" select_on_focus="true" + tool_tip="[SECOND_LIFE] Last Name" top_pad="2" width="120" /> <text diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml new file mode 100644 index 0000000000..b66aad1853 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + enabled="true" + follows="left|top|right|bottom" + height="500" + label="General" + left="102" + mouse_opaque="true" + name="Media Settings General" + width="365"> + + <text + bottom_delta="-17" + follows="top|left" + height="15" + left="10" + name=""> + Home URL: + </text> + <line_editor + bottom_delta="-21" + enabled="true" + follows="left|top" + font="SansSerif" + height="20" + left="10" + name="home_url" + tool_tip="The home URL for this media source" + width="340"> + <!-- <line_editor.commit_callback + function="Media.CommitHomeURL"/> --> + </line_editor> + <text + bottom_delta="-20" + follows="top|left" + height="15" + left="10" + name="current_url_label"> + Current URL: + </text> + <line_editor + bottom_delta="-20" + enabled="false" + follows="left|top" + font="SansSerif" + height="20" + left="10" + name="current_url" + tool_tip="The current URL for this media source" + value="" + width="340" /> + <button + bottom_delta="-20" + follows="top|left" + height="20" + label="Reset" + left_delta="233" + name="current_url_reset_btn" + width="110" > + <button.commit_callback + function="Media.ResetCurrentUrl"/> + </button> + + <web_browser + border_visible="false" + bottom_delta="-120" + follows="top|left" + left="120" + name="preview_media" + width="128" + height="128" + start_url="about:blank" + decouple_texture_size="true" /> + + <text + bottom_delta="-15" + follows="top|left" + height="15" + left="164" + name=""> + Preview + </text> + + <text + bottom_delta="-20" + follows="top|left" + height="15" + left="10" + name=""> + Controls: + </text> + <combo_box + allow_text_entry="false" + bottom_delta="-20" + enabled="true" + follows="left|top" + height="18" + left="10" + max_chars="20" + mouse_opaque="true" + name="controls" + width="120"> + <combo_item + type="string" + length="1" + enabled="true" + name="Standard" + value="Standard"> + Standard + </combo_item> + <combo_item + type="string" + length="1" + enabled="true" + name="Mini" + value="Mini"> + Mini + </combo_item> + </combo_box> + + <check_box + bottom_delta="-25" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Auto Loop" + left="10" + mouse_opaque="true" + name="auto_loop" + radio_style="false" + width="150" /> + + <check_box + bottom_delta="-25" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="First Click Interacts" + left_delta="0" + mouse_opaque="true" + name="first_click_interact" + radio_style="false" + width="150" /> + + <check_box + bottom_delta="-25" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Auto Zoom" + left_delta="0" + mouse_opaque="true" + name="auto_zoom" + radio_style="false" + width="150" /> + + <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" + height="16" initial_value="false" + label="Use Default Alternative Image" left="10" mouse_opaque="true" + name="alt_image_enable" radio_style="false" width="150" /> + + <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" + height="16" initial_value="false" + label="Auto Play Media" left="10" mouse_opaque="true" + name="auto_play" radio_style="false" width="150" /> + <text bottom_delta="-14" follows="top|left" height="15" left="30" width="340" + enabled="false" name=""> + Note: Parcel Owners & Residents can override this setting + </text> + + <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" + height="16" initial_value="false" + label="Auto Scale Media on Face of Object" left="10" mouse_opaque="true" + name="auto_scale" radio_style="false" width="150" /> + <text bottom_delta="-20" follows="top|left" height="15" left="30" name=""> + Size: + </text> + <spinner bottom_delta="0" + decimal_digits="0" enabled="true" follows="left|top" height="16" + increment="1" initial_val="256" label="" label_width="0" + left_delta="40" max_val="2000" min_val="0" mouse_opaque="true" + name="width_pixels" width="50" /> + <text bottom_delta="0" follows="top|left" height="15" left_delta="60" name=""> + X + </text> + <spinner bottom_delta="0" + decimal_digits="0" enabled="true" follows="left|top" height="16" + increment="1" initial_val="256" label="" label_width="0" + left_delta="20" max_val="2000" min_val="0" mouse_opaque="true" + name="height_pixels" width="50" /> + +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml new file mode 100644 index 0000000000..f11364874a --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel border="true" enabled="true" follows="left|top|right|bottom" + height="500" label="Controls" left="102" mouse_opaque="true" + name="Media settings for controls" width="365"> + + <text bottom_delta="-50" follows="top|left" height="15" left="10" name="" enabled="false"> + Owner + </text> + <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall" + height="16" initial_value="false" + label="Disable Navigation & Interactivity" left="30" mouse_opaque="true" + name="perms_owner_interact" radio_style="false" width="250" /> + + <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall" + height="16" initial_value="false" + label="Hide Control Bar" left="30" mouse_opaque="true" + name="perms_owner_control" radio_style="false" width="250" /> + + <text bottom_delta="-36" follows="top|left" height="15" left="10" name="perms_group_name_label" enabled="false"> + Group + </text> + <name_box bottom_delta="-5" enabled="false" follows="left|top" font="SansSerif" + height="20" left="60" name="perms_group_name" + value ="" + width="200" /> + <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall" + height="16" initial_value="false" + label="Disable Navigation & Interactivity" left="30" mouse_opaque="true" + name="perms_group_interact" radio_style="false" width="250" /> + + <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall" + height="16" initial_value="false" + label="Hide Control Bar" left="30" mouse_opaque="true" + name="perms_group_control" radio_style="false" width="250" /> + + <text bottom_delta="-36" follows="top|left" height="15" left="10" name="" enabled="false"> + Anyone + </text> + <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall" + height="16" initial_value="false" + label="Disable Navigation & Interactivity" left="30" mouse_opaque="true" + name="perms_anyone_interact" radio_style="false" width="250" /> + + <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall" + height="16" initial_value="false" + label="Hide Control Bar" left="30" mouse_opaque="true" + name="perms_anyone_control" radio_style="false" width="250" /> + +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml new file mode 100644 index 0000000000..695e956e41 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + enabled="true" + follows="left|top|right|bottom" + height="500" + label="Security" + left="102" + mouse_opaque="true" + name="Media Settings Security" + width="365"> + <check_box + bottom_delta="-40" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Only Allow Access to Specified URLs (by prefix)" + left="10" + mouse_opaque="true" + name="whitelist_enable" + radio_style="false" + width="250" /> + <scroll_list + follows="top|left" + height="200" + left="30" + name="whitelist" + width="315" + enabled="true" /> + <button + bottom_delta="-30" + follows="top|left" + height="20" + label="Add" + left="30" + name="whitelist_add" + width="70" + enabled="true"> + <button.commit_callback + function="Media.whitelistAdd"/> + </button> + <button + bottom_delta="0" + follows="top|left" + height="20" + label="Delete" + left="275" + name="whitelist_del" + width="70" + enabled="true"> + <button.commit_callback + function="Media.whitelistDelete"/> + </button> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 683a54b366..4088d96ebf 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -35,6 +35,8 @@ follows="right" height="20" speak_button.font="SansSerifMedium" + speak_button.tab_stop="true" + show_button.tab_stop="true" layout="topleft" left_pad="5" name="talk" diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 58ebac2a84..2056ec14d5 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -2,7 +2,7 @@ <panel bevel_style="in" follows="left|top|right|bottom" - height="420" + height="460" label="Notes & Privacy" layout="topleft" left="0" @@ -16,7 +16,7 @@ layout="topleft" left="0" top="0" - height="420" + height="430" width="313" border_size="0"> <panel diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index d0bde77cf2..1bd1953397 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="left|top|right|bottom" - height="515" + height="555" label="Picks" layout="topleft" left="0" @@ -11,7 +11,7 @@ <flat_list_view color="DkGray2" follows="left|top|right|bottom" - height="495" + height="465" layout="topleft" left="0" name="picks_list" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 8f710545d5..06ecfdc995 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -261,17 +261,17 @@ My Avatar: label="Show script errors" layout="topleft" left="30" - name="first_person_avatar_visible" + name="show_script_errors" width="256" top_pad="10"/> <radio_group - enabled_control="EnableVoiceChat" - control_name="VoiceEarLocation" + enabled_control="EnableShowScriptErrors" + control_name="ShowScriptErrorsLocation" draw_border="false" height="40" layout="topleft" left_delta="50" - name="ear_location" + name="show_location" top_pad="5" width="364"> <radio_item diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 56ba5970f2..02d179d503 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="515" + height="560" label="Profile" layout="topleft" left="0" @@ -25,7 +25,7 @@ <scroll_container color="DkGray2" follows="left|top|right|bottom" - height="515" + height="500" min_height="300" layout="topleft" name="profile_scroll" @@ -265,6 +265,7 @@ left="0" name="profile_buttons_panel" top_pad="0" + height="25" width="313"> <button follows="bottom|left" @@ -316,6 +317,7 @@ name="profile_me_buttons_panel" top_pad="0" visible="false" + height="25" width="313"> <button follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index cbe646f3cc..606535115d 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -2,7 +2,7 @@ <panel background_visible="true" follows="all" - height="660" + height="570" layout="topleft" min_height="350" min_width="240" @@ -50,7 +50,7 @@ width="25" /> <tab_container follows="left|top|right|bottom" - height="660" + height="560" layout="topleft" left="10" name="tabs" diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index 5738879c5a..a3c714ce72 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -184,9 +184,9 @@ layout="topleft" name="Help..." /> <menu_item_call - label="LSL Wiki Help..." + label="Keyword Help..." layout="topleft" - name="LSL Wiki Help..." /> + name="Keyword Help..." /> </menu> </menu_bar> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml index f25c4bfbba..aa76a61c15 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml @@ -19,4 +19,17 @@ top="4" value="Side Panel" width="255" /> + <button + follows="left|right|top" + font="SansSerif" + height="23" + label="?" + layout="topleft" + name="show_help" + top="5" + right="-8" + width="28"> + <button.commit_callback + function="Button.ShowHelp" /> + </button> </panel> 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 c178554287..f6ffd2e4ee 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -52,7 +52,7 @@ left="-210" name="buycurrency" picture_style="true" - tool_tip="My Balance / Buy currency" + tool_tip="My Balance / Buy L$" top="0" width="117" /> <text 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 a0fc986423..aa95a2baef 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -111,7 +111,7 @@ width="380"> </flat_list_view> </accordion_tab> - + <accordion_tab can_resize="false" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 13a53a4ce3..1e85cac539 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -93,7 +93,6 @@ <string name="BUTTON_RESTORE">Restore</string> <string name="BUTTON_MINIMIZE">Minimize</string> <string name="BUTTON_TEAR_OFF">Tear Off</string> - <string name="BUTTON_EDIT">Edit</string> <string name="BUTTON_DOCK">Dock</string> <string name="BUTTON_UNDOCK">Undock</string> <string name="BUTTON_HELP">Show Help</string> @@ -308,112 +307,115 @@ Sleeps script for [SLEEP_TIME] seconds. <string name="LSLTipText_llSin"> float llSin(float theta) -theta in radians +Returns the sine of theta (theta in radians) </string> <string name="LSLTipText_llCos"> float llCos(float theta) -theta in radians +Returns the cosine of theta (theta in radians) </string> <string name="LSLTipText_llTan"> float llTan(float theta) -theta radians +Returns the tangent of theta (theta in radians) </string> <string name="LSLTipText_llAtan2"> float llAtan2(float y, float x) +Returns the arctangent2 of y, x </string> <string name="LSLTipText_llSqrt"> float llSqrt(float val) -returns 0 and triggers a Math Error for imaginary results +Returns the square root of val, or returns 0 and triggers a Math Error for imaginary results </string> <string name="LSLTipText_llPow"> float llPow(float base, float exponent) -returns 0 and triggers Math Error for imaginary results +Returns the base raised to the power exponent, or returns 0 and triggers Math Error for imaginary results </string> <string name="LSLTipText_llAbs"> integer llAbs(integer val) +Returns the positive version of val </string> <string name="LSLTipText_llFabs"> float llFabs(float val) +Returns the positive version of val </string> <string name="LSLTipText_llFrand"> float llFrand(float mag) -returns random number in range [0,mag) +Returns a pseudo random number in the range [0,mag) or (mag,0] </string> <string name="LSLTipText_llFloor"> integer llFloor(float val) -returns largest integer value <= val +Returns largest integer value <= val </string> <string name="LSLTipText_llCeil"> integer llCeil(float val) -returns smallest integer value >= val +Returns smallest integer value >= val </string> <string name="LSLTipText_llRound"> integer llRound(float val) -returns val rounded to the nearest integer +Returns val rounded to the nearest integer </string> <string name="LSLTipText_llVecMag"> float llVecMag(vector v) -returns the magnitude of v +Returns the magnitude of v </string> <string name="LSLTipText_llVecNorm"> vector llVecNorm(vector v) -returns the v normalized +Returns the v normalized </string> <string name="LSLTipText_llVecDist"> float llVecDist(vector v1, vector v2) -returns the 3D distance between v1 and v2 +Returns the 3D distance between v1 and v2 </string> <string name="LSLTipText_llRot2Euler"> vector llRot2Euler(rotation q) -returns the Euler representation (roll, pitch, yaw) of q +Returns the Euler representation (roll, pitch, yaw) of q </string> <string name="LSLTipText_llEuler2Rot"> rotation llEuler2Rot(vector v) -returns the rotation representation of Euler Angles v +Returns the rotation representation of Euler Angles v </string> <string name="LSLTipText_llAxes2Rot"> rotation llAxes2Rot(vector fwd, vector left, vector up) -returns the rotation defined by the coordinate axes +Returns the rotation defined by the coordinate axes </string> <string name="LSLTipText_llRot2Fwd"> vector llRot2Fwd(rotation q) -returns the forward vector defined by q +Returns the forward vector defined by q </string> <string name="LSLTipText_llRot2Left"> vector llRot2Left(rotation q) -returns the left vector defined by q +Returns the left vector defined by q </string> <string name="LSLTipText_llRot2Up"> vector llRot2Up(rotation q) -returns the up vector defined by q +Returns the up vector defined by q </string> <string name="LSLTipText_llRotBetween"> rotation llRotBetween(vector v1, vector v2) -returns the rotation to rotate v1 to v2 +Returns the rotation to rotate v1 to v2 </string> <string name="LSLTipText_llWhisper"> llWhisper(integer channel, string msg) -whispers msg on channel +Whispers the text of msg on channel </string> <string name="LSLTipText_llSay"> llSay(integer channel, string msg) -says msg on channel +Says the text of msg on channel </string> <string name="LSLTipText_llShout"> llShout(integer channel, string msg) -shouts msg on channel +Shouts the text of msg on channel </string> <string name="LSLTipText_llListen"> integer llListen(integer channel, string name, key id, string msg) -sets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen +Sets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen </string> <string name="LSLTipText_llListenControl"> llListenControl(integer number, integer active) -makes a listen event callback active or inactive +Makes a listen event callback active or inactive </string> <string name="LSLTipText_llListenRemove"> llListenRemove(integer number) -removes listen event callback number +Removes listen event callback number </string> <string name="LSLTipText_llSensor"> llSensor(string name, key id, integer type, float range, float arc) @@ -421,43 +423,43 @@ Performs a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or </string> <string name="LSLTipText_llSensorRepeat"> llSensorRepeat(string name, key id, integer type, float range, float arc, float rate) -sets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds +Sets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds </string> <string name="LSLTipText_llSensorRemove"> llSensorRemove() -removes sensor +Removes the sensor setup by llSensorRepeat </string> <string name="LSLTipText_llDetectedName"> string llDetectedName(integer number) -returns the name of detected object number (returns empty string if number is not valid sensed object) +Returns the name of detected object number (returns empty string if number is not a valid sensed object) </string> <string name="LSLTipText_llDetectedKey"> key llDetectedKey(integer number) -returns the key of detected object number (returns empty key if number is not valid sensed object) +Returns the key of detected object number (returns empty key if number is not a valid sensed object) </string> <string name="LSLTipText_llDetectedOwner"> key llDetectedOwner(integer number) -returns the key of detected object's owner (returns empty key if number is not valid sensed object) +Returns the key of detected object's owner (returns empty key if number is not a valid sensed object) </string> <string name="LSLTipText_llDetectedType"> integer llDetectedType(integer number) -returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not valid sensed object) +Returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not a valid sensed object) </string> <string name="LSLTipText_llDetectedPos"> vector llDetectedPos(integer number) -returns the position of detected object number (returns <0,0,0> if number is not valid sensed object) +Returns the position of detected object number (returns <0,0,0> if number is not a valid sensed object) </string> <string name="LSLTipText_llDetectedVel"> vector llDetectedVel(integer number) -returns the velocity of detected object number (returns <0,0,0> if number is not valid sensed object) +Returns the velocity of detected object number (returns <0,0,0> if number is not a valid sensed object) </string> <string name="LSLTipText_llDetectedGrab"> vector llDetectedGrab(integer number) -returns the grab offset of the user touching object (returns <0,0,0> if number is not valid sensed object) +Returns the grab offset of the user touching object (returns <0,0,0> if number is not a valid sensed object) </string> <string name="LSLTipText_llDetectedRot"> rotation llDetectedRot(integer number) -returns the rotation of detected object number (returns <0,0,0,1> if number is not valid sensed object) +Returns the rotation of detected object number (returns <0,0,0,1> if number is not a valid sensed object) </string> <string name="LSLTipText_llDetectedGroup"> integer llDetectedGroup(integer number) @@ -465,127 +467,127 @@ Returns TRUE if detected object is part of same group as owner </string> <string name="LSLTipText_llDetectedLinkNumber"> integer llDetectedLinkNumber(integer number) -returns the link position of the triggered event for touches and collisions only +Returns the link position of the triggered event for touches and collisions only </string> <string name="LSLTipText_llDie"> llDie() -deletes the object +Deletes the object </string> <string name="LSLTipText_llGround"> -float llGround(vector v) -returns the ground height below the object position + v +float llGround(vector offset) +Returns the ground height below the object position + offset </string> <string name="LSLTipText_llCloud"> -float llCloud(vector v) -returns the cloud density at the object position + v +float llCloud(vector offset) +Returns the cloud density at the object position + offset </string> <string name="LSLTipText_llWind"> -vector llWind(vector v) -returns the wind velocity at the object position + v +vector llWind(vector offset) +Returns the wind velocity at the object position + offset </string> <string name="LSLTipText_llSetStatus"> llSetStatus(integer status, integer value) -sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value +Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value </string> <string name="LSLTipText_llGetStatus"> integer llGetStatus(integer status) -gets value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) +Returns value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) </string> <string name="LSLTipText_llSetScale"> llSetScale(vector scale) -sets the scale +Sets the scale of the prim </string> <string name="LSLTipText_llGetScale"> vector llGetScale() -gets the scale +Returns the scale of the prim </string> <string name="LSLTipText_llSetColor"> llSetColor(vector color, integer face) -sets the color +Sets the color on face of the prim </string> <string name="LSLTipText_llGetAlpha"> float llGetAlpha(integer face) -gets the alpha +Returns the alpha of face </string> <string name="LSLTipText_llSetAlpha"> llSetAlpha(float alpha, integer face) -sets the alpha +Sets the alpha on face </string> <string name="LSLTipText_llGetColor"> vector llGetColor(integer face) -gets the color +Returns the color on face </string> <string name="LSLTipText_llSetTexture"> llSetTexture(string texture, integer face) -sets the texture of face +Sets the texture of face or ALL_SIDES </string> <string name="LSLTipText_llScaleTexture"> -llScaleTexture(float scales, float scalet, integer face) -sets the texture s, t scales for the chosen face +llScaleTexture(float u, float v, integer face) +Sets the texture u & v scales for the chosen face or ALL_SIDES </string> <string name="LSLTipText_llOffsetTexture"> -llOffsetTexture(float offsets, float offsett, integer face) -sets the texture s, t offsets for the chosen face +llOffsetTexture(float u, float v, integer face) +Sets the texture u & v offsets for the chosen face or ALL_SIDES </string> <string name="LSLTipText_llRotateTexture"> llRotateTexture(float rotation, integer face) -sets the texture rotation for the chosen face +Sets the texture rotation for the chosen face </string> <string name="LSLTipText_llGetTexture"> string llGetTexture(integer face) -gets the texture of face (if it's a texture in the object inventory, otherwise the key in a string) +Returns a string that is the texture on face (the inventory name if it is a texture in the prim's inventory, otherwise the key) </string> <string name="LSLTipText_llSetPos"> llSetPos(vector pos) -sets the position (if the script isn't physical) +Moves the object or prim towards pos without using physics (if the script isn't physical) </string> <string name="LSLTipText_llGetPos"> vector llGetPos() -gets the position (if the script isn't physical) +Returns the position of the task in region coordinates </string> <string name="LSLTipText_llGetLocalPos"> vector llGetLocalPos() -gets the position relative to the root (if the script isn't physical) +Returns the position relative to the root </string> <string name="LSLTipText_llSetRot"> llSetRot(rotation rot) -sets the rotation (if the script isn't physical) +Sets the rotation </string> <string name="LSLTipText_llGetRot"> rotation llGetRot() -gets the rotation (if the script isn't physical) +Returns the rotation relative to the region's axes </string> <string name="LSLTipText_llGetLocalRot"> rotation llGetLocalRot() -gets the rotation local to the root (if the script isn't physical) +Returns the rotation local to the root </string> <string name="LSLTipText_llSetForce"> llSetForce(vector force, integer local) -sets force on object, in local coords if local == TRUE (if the script is physical) +Applies force to the object (if the script is physical), in local coords if local == TRUE </string> <string name="LSLTipText_llGetForce"> vector llGetForce() -gets the force (if the script is physical) +Returns the force (if the script is physical) </string> <string name="LSLTipText_llTarget"> integer llTarget(vector position, float range) -set positions within range of position as a target and return an ID for the target +Sets positions within range of position as a target and return an ID for the target </string> <string name="LSLTipText_llTargetRemove"> llTargetRemove(integer number) -removes target number +Removes positional target number registered with llTarget </string> <string name="LSLTipText_llRotTarget"> integer llRotTarget(rotation rot, float error) -set rotations with error of rot as a rotational target and return an ID for the rotational target +Set rotations with error of rot as a rotational target and return an ID for the rotational target </string> <string name="LSLTipText_llRotTargetRemove"> llRotTargetRemove(integer number) -removes rotational target number +Removes rotational target number registered with llRotTarget </string> <string name="LSLTipText_llMoveToTarget"> llMoveToTarget(vector target, float tau) -critically damp to target in tau seconds (if the script is physical) +Critically damps to target in tau seconds (if the script is physical) </string> <string name="LSLTipText_llStopMoveToTarget"> llStopMoveToTarget() @@ -593,83 +595,83 @@ Stops critically damped motion </string> <string name="LSLTipText_llApplyImpulse"> llApplyImpulse(vector force, integer local) -applies impulse to object, in local coords if local == TRUE (if the script is physical) +Applies impulse to object (if the script is physical), in local coords if local == TRUE </string> <string name="LSLTipText_llApplyRotationalImpulse"> llApplyRotationalImpulse(vector force, integer local) -applies rotational impulse to object, in local coords if local == TRUE (if the script is physical) +Applies rotational impulse to object (if the script is physical), in local coords if local == TRUE </string> <string name="LSLTipText_llSetTorque"> llSetTorque(vector torque, integer local) -sets the torque of object, in local coords if local == TRUE (if the script is physical) +Sets the torque of object (if the script is physical), in local coords if local == TRUE </string> <string name="LSLTipText_llGetTorque"> vector llGetTorque() -gets the torque (if the script is physical) +Returns the torque (if the script is physical) </string> <string name="LSLTipText_llSetForceAndTorque"> llSetForceAndTorque(vector force, vector torque, integer local) -sets the force and torque of object, in local coords if local == TRUE (if the script is physical) +Sets the force and torque of object (if the script is physical), in local coords if local == TRUE </string> <string name="LSLTipText_llGetVel"> vector llGetVel() -gets the velocity +Returns the velocity of the object </string> <string name="LSLTipText_llGetAccel"> vector llGetAccel() -gets the acceleration +Returns the acceleration of the object relative to the region's axes </string> <string name="LSLTipText_llGetOmega"> vector llGetOmega() -gets the omega +Returns the rotation velocity in radians per second </string> <string name="LSLTipText_llGetTimeOfDay"> float llGetTimeOfDay() -gets the time in seconds since [SECOND_LIFE] server midnight (or since server up-time; whichever is smaller) +Returns the time in seconds since [SECOND_LIFE] server midnight or since region up-time, whichever is smaller </string> <string name="LSLTipText_llGetWallclock"> float llGetWallclock() -gets the time in seconds since midnight +Returns the time in seconds since midnight California Pacific time (PST/PDT) </string> <string name="LSLTipText_llGetTime"> float llGetTime() -gets the time in seconds since creation +Returns the time in seconds since the last region reset, script reset, or call to either llResetTime or llGetAndResetTime </string> <string name="LSLTipText_llResetTime"> llResetTime() -sets the time to zero +Sets the script timer to zero </string> <string name="LSLTipText_llGetAndResetTime"> float llGetAndResetTime() -gets the time in seconds since creation and sets the time to zero +Returns the script time in seconds and then resets the script timer to zero </string> <string name="LSLTipText_llSound"> llSound(string sound, float volume, integer queue, integer loop) -plays sound at volume and whether it should loop or not +Plays sound at volume and whether it should loop or not </string> <string name="LSLTipText_llPlaySound"> llPlaySound(string sound, float volume) -plays attached sound once at volume (0.0 - 1.0) +Plays attached sound once at volume (0.0 - 1.0) </string> <string name="LSLTipText_llLoopSound"> llLoopSound(string sound, float volume) -plays attached sound looping indefinitely at volume (0.0 - 1.0) +Plays attached sound looping indefinitely at volume (0.0 - 1.0) </string> <string name="LSLTipText_llLoopSoundMaster"> llLoopSoundMaster(string sound, float volume) -plays attached sound looping at volume (0.0 - 1.0), declares it a sync master +Plays attached sound looping at volume (0.0 - 1.0), declares it a sync master </string> <string name="LSLTipText_llLoopSoundSlave"> llLoopSoundSlave(string sound, float volume) -plays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master +Plays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master </string> <string name="LSLTipText_llPlaySoundSlave"> llPlaySoundSlave(string sound, float volume) -plays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master +Plays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master </string> <string name="LSLTipText_llTriggerSound"> llTriggerSound(string sound, float volume) -plays sound at volume (0.0 - 1.0), centered at but not attached to object +Plays sound at volume (0.0 - 1.0), centered at but not attached to object </string> <string name="LSLTipText_llStopSound"> llStopSound() @@ -677,143 +679,143 @@ Stops currently attached sound </string> <string name="LSLTipText_llPreloadSound"> llPreloadSound(string sound) -preloads a sound on viewers within range +Preloads a sound on viewers within range </string> <string name="LSLTipText_llGetSubString"> string llGetSubString(string src, integer start, integer end) -returns the indicated substring +Returns the indicated substring </string> <string name="LSLTipText_llDeleteSubString"> string llDeleteSubString(string src, integer start, integer end) -removes the indicated substring and returns the result +Removes the indicated substring and returns the result </string> <string name="LSLTipText_llInsertString"> string llInsertString(string dst, integer position, string src) -inserts src into dst at position and returns the result +Returns a destination string dst with the string src inserted starting at position pos </string> <string name="LSLTipText_llToUpper"> string llToUpper(string src) -convert src to all upper case and returns the result +Returns a string that is src with all upper-case characters </string> <string name="LSLTipText_llToLower"> string llToLower(string src) -convert src to all lower case and returns the result +Returns a string that is src with all lower-case characters </string> <string name="LSLTipText_llGiveMoney"> llGiveMoney(key destination, integer amount) -transfer amount of money from script owner to destination +Transfers amount of L$ from script owner to destination </string> <string name="LSLTipText_llMakeExplosion"> llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset) -Make a round explosion of particles +Makes a round explosion of particles </string> <string name="LSLTipText_llMakeFountain"> llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset) -Make a fountain of particles +Makes a fountain of particles </string> <string name="LSLTipText_llMakeSmoke"> llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset) -Make smoke like particles +Makes smoke like particles </string> <string name="LSLTipText_llMakeFire"> llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset) -Make fire like particles +Makes fire like particles </string> <string name="LSLTipText_llRezObject"> llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param) -Instanciate owners inventory object at pos with velocity vel and rotation rot with start parameter param +Instantiates owner's inventory object at pos with velocity vel and rotation rot with start parameter param </string> <string name="LSLTipText_llLookAt"> -llLookAt(vector target, F32 strength, F32 damping) -Cause object name to point it's forward axis towards target +llLookAt(vector target, float strength, float damping) +Causes object to point its up axis (positive z) towards target, while keeping its forward axis (positive x) below the horizon </string> <string name="LSLTipText_llStopLookAt"> llStopLookAt() -Stop causing object name to point at a target +Stops causing object to point at a target </string> <string name="LSLTipText_llSetTimerEvent"> llSetTimerEvent(float sec) -Cause the timer event to be triggered every sec seconds +Causes the timer event to be triggered a maximum of once every sec seconds </string> <string name="LSLTipText_llSleep"> llSleep(float sec) -Put script to sleep for sec seconds +Puts the script to sleep for sec seconds </string> <string name="LSLTipText_llGetMass"> float llGetMass() -Get the mass of task name that script is attached to +Returns the mass of object that the script is attached to </string> <string name="LSLTipText_llCollisionFilter"> llCollisionFilter(string name, key id, integer accept) -if accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id +Sets the collision filter, exclusively or inclusively. If accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id </string> <string name="LSLTipText_llTakeControls"> llTakeControls(integer controls, integer accept, integer pass_on) -Take controls from agent task has permissions for. If (accept == (controls & input)), send input to task. If pass_on send to agent also. +Allows for intercepting keyboard and mouse clicks from the agent the script has permissions for </string> <string name="LSLTipText_llReleaseControls"> llReleaseControls() -Stop taking inputs +Stops taking inputs that were taken with llTakeControls </string> <string name="LSLTipText_llAttachToAvatar"> -llAttachToAvatar(integer attachment) -Attach to avatar task has permissions for at point attachment +llAttachToAvatar(integer attach_point) +Attaches the object to the avatar who has granted permission to the script </string> <string name="LSLTipText_llDetachFromAvatar"> llDetachFromAvatar() -Drop off of avatar +Detaches object from avatar </string> <string name="LSLTipText_llTakeCamera"> llTakeCamera(key avatar) -Move avatar's viewpoint to task +Moves avatar's viewpoint to task </string> <string name="LSLTipText_llReleaseCamera"> llReleaseCamera(key avatar) -Return camera to agent +Returns camera to agent avatar </string> <string name="LSLTipText_llGetOwner"> key llGetOwner() -Returns the owner of the task +Returns the object owner's UUID </string> <string name="LSLTipText_llInstantMessage"> llInstantMessage(key user, string message) -IMs message to the user +Sends the specified string as an Instant Message to the user </string> <string name="LSLTipText_llEmail"> llEmail(string address, string subject, string message) -Sends email to address with subject and message +Sends an email to address with the subject and message </string> <string name="LSLTipText_llGetNextEmail"> llGetNextEmail(string address, string subject) -Get the next waiting email with appropriate address and/or subject (if blank they are ignored) +Gets the next waiting email that comes from address, with specified subject </string> <string name="LSLTipText_llGetKey"> key llGetKey() -Get the key for the task the script is attached to +Returns the key of the prim the script is attached to </string> <string name="LSLTipText_llSetBuoyancy"> llSetBuoyancy(float buoyancy) -Set the tasks buoyancy (0 is none, < 1.0 sinks, 1.0 floats, > 1.0 rises) +Sets the buoyancy of the task or object (0 is disabled, < 1.0 sinks, 1.0 floats, > 1.0 rises) </string> <string name="LSLTipText_llSetHoverHeight"> llSetHoverHeight(float height, integer water, float tau) -Critically damps to a height (either above ground level or above the higher of land and water if water == TRUE) +Critically damps to a height above the ground (or water) in tau seconds </string> <string name="LSLTipText_llStopHover"> llStopHover() -Stop hovering to a height +Stops hovering to a height </string> <string name="LSLTipText_llMinEventDelay"> llMinEventDelay(float delay) -Set the minimum time between events being handled +Sets the minimum time between events being handled </string> <string name="LSLTipText_llSoundPreload"> llSoundPreload(string sound) -preloads a sound on viewers within range +Preloads a sound on viewers within range </string> <string name="LSLTipText_llRotLookAt"> -llRotLookAt(rotation target, F32 strength, F32 damping) -Cause object name to point it's forward axis towards target +llRotLookAt(rotation target, float strength, float damping) +Causes object name to point its forward axis towards target </string> <string name="LSLTipText_llStringLength"> integer llStringLength(string str) @@ -821,84 +823,83 @@ Returns the length of string </string> <string name="LSLTipText_llStartAnimation"> llStartAnimation(string anim) -Start animation anim for agent that owns object +Starts animation anim for agent that granted PERMISSION_TRIGGER_ANIMATION if the permission has not been revoked </string> <string name="LSLTipText_llStopAnimation"> llStopAnimation(string anim) -Stop animation anim for agent that owns object +Stops animation anim for agent that granted permission </string> <string name="LSLTipText_llPointAt"> llPointAt(vector pos) -Make agent that owns object point at pos +Makes agent that owns object point at pos </string> <string name="LSLTipText_llStopPointAt"> llStopPointAt() -Stop agent that owns object pointing +Stops pointing agent that owns object </string> <string name="LSLTipText_llTargetOmega"> llTargetOmega(vector axis, float spinrate, float gain) -Attempt to spin at spinrate with strength gain +Rotates the object around axis at spinrate with strength gain </string> <string name="LSLTipText_llGetStartParameter"> integer llGetStartParameter() -Get's the start paramter passed to llRezObject +Returns an integer that is the script start/rez parameter </string> <string name="LSLTipText_llGodLikeRezObject"> llGodLikeRezObject(key inventory, vector pos) -rez directly off of a UUID if owner has dog-bit set +Rezzes directly off of UUID if owner is in God Mode </string> <string name="LSLTipText_llRequestPermissions"> llRequestPermissions(key agent, integer perm) -ask agent to allow the script to do perm (NB: Debit, ownership, link, joint, and permission requests can only go to the task's owner) +Asks the agent for permission to run certain classes of functions </string> <string name="LSLTipText_llGetPermissionsKey"> key llGetPermissionsKey() -Return agent that permissions are enabled for. NULL_KEY if not enabled +Returns the key of the avatar that last granted permissions to the script </string> <string name="LSLTipText_llGetPermissions"> integer llGetPermissions() -return what permissions have been enabled +Returns an integer bitfield with the permissions that have been granted </string> <string name="LSLTipText_llGetLinkNumber"> integer llGetLinkNumber() -Returns what number in a link set the script is attached to (0 means no link, 1 the root, 2 for first child, etc) +Returns the link number of the prim containing the script (0 means not linked, 1 the prim is the root, 2 the prim is the first child, etc) </string> <string name="LSLTipText_llSetLinkColor"> llSetLinkColor(integer linknumber, vector color, integer face) -If a task exists in the link chain at linknumber, set face to color +Sets face to color if a task exists in the link chain at linknumber </string> <string name="LSLTipText_llCreateLink"> llCreateLink(key target, integer parent) -Attempt to link task script is attached to and target (requires permission PERMISSION_CHANGE_LINKS be set). If parent == TRUE, task script is attached to is the root +Attempts to link the script's object with the target (requires that PERMISSION_CHANGE_LINKS be granted). If parent == TRUE, then the script's object becomes the root </string> <string name="LSLTipText_llBreakLink"> llBreakLink(integer linknum) -Delinks the task with the given link number (requires permission PERMISSION_CHANGE_LINKS be set) +Delinks the prim with the given link number in a linked object set (requires that PERMISSION_CHANGE_LINKS be granted) </string> <string name="LSLTipText_llBreakAllLinks"> llBreakAllLinks() -Delinks all tasks in the link set (requires permission PERMISSION_CHANGE_LINKS be set) +Delinks all prims in the link set (requires that PERMISSION_CHANGE_LINKS be granted) </string> <string name="LSLTipText_llGetLinkKey"> -key llGetLinkKey(integer linknum) -Get the key of linknumber in link set +key llGetLinkKey(integer linknumber) +Returns the key of the linked prim linknumber </string> <string name="LSLTipText_llGetLinkName"> -string llGetLinkName(integer linknum) -Get the name of linknumber in link set +string llGetLinkName(integer linknumber) +Returns the name of linknumber in a link set </string> <string name="LSLTipText_llGetInventoryNumber"> integer llGetInventoryNumber(integer type) -Get the number of items of a given type in the task's inventory. -Valid types: INVENTORY_TEXTURE, INVENTORY_SOUND, INVENTORY_OBJECT, INVENTORY_SCRIPT, INVENTORY_CLOTHING, INVENTORY_BODYPART, INVENTORY_NOTECARD, INVENTORY_LANDMARK, INVENTORY_ALL +Returns the number of items of a given type (INVENTORY_* flag) in the prim's inventory </string> <string name="LSLTipText_llGetInventoryName"> string llGetInventoryName(integer type, integer number) -Get the name of the inventory item number of type +Returns the name of the inventory item number of a given type </string> <string name="LSLTipText_llSetScriptState"> llSetScriptState(string name, integer run) -Control the state of a script name. +Sets the running state of the specified script </string> <string name="LSLTipText_llGetEnergy"> float llGetEnergy() @@ -906,56 +907,55 @@ Returns how much energy is in the object as a percentage of maximum </string> <string name="LSLTipText_llGiveInventory"> llGiveInventory(key destination, string inventory) -Give inventory to destination +Gives inventory to destination </string> <string name="LSLTipText_llRemoveInventory"> -llRemoveInventory(string inventory) -Remove the named inventory item +llRemoveInventory(string item) +Removes the named inventory item </string> <string name="LSLTipText_llSetText"> llSetText(string text, vector color, float alpha) -Set text floating over object +Displays text that hovers over the prim with specific color and translucency specified with alpha </string> <string name="LSLTipText_llWater"> -float llWater(vector v) -returns the water height below the object position + v +float llWater(vector offset) +Returns the water height below the object position + offset </string> <string name="LSLTipText_llPassTouches"> llPassTouches(integer pass) -if pass == TRUE, touches are passed from children on to parents (default is FALSE) +If pass == TRUE, touches are passed from children on to parents </string> <string name="LSLTipText_llRequestAgentData"> key llRequestAgentData(key id, integer data) -Requests data about agent id. When data is available the dataserver event will be raised +Requests data about agent id. When data is available the dataserver event will be raised. </string> <string name="LSLTipText_llRequestInventoryData"> key llRequestInventoryData(string name) -Requests data from object's inventory object. When data is available the dataserver event will be raised +Requests data from object's inventory object. When data is available the dataserver event will be raised. </string> <string name="LSLTipText_llSetDamage"> llSetDamage(float damage) -Sets the amount of damage that will be done to an object that this task hits. Task will be killed. +Sets the amount of damage that will be done when this object hits an avatar. </string> <string name="LSLTipText_llTeleportAgentHome"> llTeleportAgentHome(key id) -Teleports agent on owner's land to agent's home location +Teleports avatar on the owner's land to their home location without any warning </string> <string name="LSLTipText_llModifyLand"> -llModifyLand(integer action, integer size) -Modify land with action (LAND_LEVEL, LAND_RAISE, LAND_LOWER, LAND_SMOOTH, LAND_NOISE, LAND_REVERT) -on size (LAND_SMALL_BRUSH, LAND_MEDIUM_BRUSH, LAND_LARGE_BRUSH) +llModifyLand(integer action, integer brush) +Modifies land using the specified action on the specified brush size of land </string> <string name="LSLTipText_llCollisionSound"> llCollisionSound(string impact_sound, float impact_volume) -Suppress default collision sounds, replace default impact sounds with impact_sound (empty string to just suppress) +Suppresses default collision sounds, replaces default impact sounds with impact_sound at the volume impact_volume </string> <string name="LSLTipText_llCollisionSprite"> llCollisionSprite(string impact_sprite) -Suppress default collision sprites, replace default impact sprite with impact_sprite (empty string to just suppress) +Suppresses default collision sprites, replaces default impact sprite with impact_sprite (use an empty string to just suppress) </string> <string name="LSLTipText_llGetAnimation"> string llGetAnimation(key id) -Get the currently playing locomotion animation for avatar id +Returns the name of the currently playing locomotion animation for avatar id </string> <string name="LSLTipText_llResetScript"> llResetScript() @@ -963,12 +963,7 @@ Resets the script </string> <string name="LSLTipText_llMessageLinked"> llMessageLinked(integer linknum, integer num, string str, key id) -Sends num, str, and id to members of the link set -(LINK_ROOT sends to root task in a linked set, -LINK_SET sends to all tasks, -LINK_ALL_OTHERS to all other tasks, -LINK_ALL_CHILDREN to all children, -LINK_THIS to the task the script it is in) +Allows scripts in the same object to communicate. Triggers a link_message event with the same parameters num, str, and id in all scripts in the prim(s) described by linknum. </string> <string name="LSLTipText_llPushObject"> llPushObject(key id, vector impulse, vector ang_impulse, integer local) @@ -976,19 +971,19 @@ Applies impulse and ang_impulse to object id </string> <string name="LSLTipText_llPassCollisions"> llPassCollisions(integer pass) -if pass == TRUE, collisions are passed from children on to parents (default is FALSE) +If pass == TRUE, collisions are passed from children on to parents (default is FALSE) </string> <string name="LSLTipText_llGetScriptName"> -llGetScriptName() -Returns the script name +string llGetScriptName() +Returns the name of the script that this function is used in </string> <string name="LSLTipText_llGetNumberOfSides"> integer llGetNumberOfSides() -Returns the number of sides +Returns the number of faces (or sides) of the prim </string> <string name="LSLTipText_llAxisAngle2Rot"> rotation llAxisAngle2Rot(vector axis, float angle) -Returns the rotation generated angle about axis +Returns the rotation that is a generated angle about axis </string> <string name="LSLTipText_llRot2Axis"> vector llRot2Axis(rotation rot) @@ -1012,19 +1007,19 @@ Returns angle between rotation a and b </string> <string name="LSLTipText_llGetInventoryKey"> key llGetInventoryKey(string name) -Returns the key of the inventory name +Returns the key that is the UUID of the inventory name </string> <string name="LSLTipText_llAllowInventoryDrop"> llAllowInventoryDrop(integer add) -If add == TRUE, users without permissions can still drop inventory items onto task +If add == TRUE, users without modify permissions can still drop inventory items onto a prim </string> <string name="LSLTipText_llGetSunDirection"> vector llGetSunDirection() -Returns the sun direction on the simulator +Returns a normalized vector of the direction of the sun in the region </string> <string name="LSLTipText_llGetTextureOffset"> -vector llGetTextureOffset(integer side) -Returns the texture offset of side in the x and y components of a vector +vector llGetTextureOffset(integer face) +Returns the texture offset of face in the x and y components of a vector </string> <string name="LSLTipText_llGetTextureScale"> vector llGetTextureScale(integer side) @@ -1036,55 +1031,57 @@ Returns the texture rotation of side </string> <string name="LSLTipText_llSubStringIndex"> integer llSubStringIndex(string source, string pattern) -Finds index in source where pattern first appears (returns -1 if not found) +Returns an integer that is the index in source where pattern first appears. +(Returns -1 if not found) </string> <string name="LSLTipText_llGetOwnerKey"> key llGetOwnerKey(key id) -Find the owner of id +Returns the owner of object id </string> <string name="LSLTipText_llGetCenterOfMass"> vector llGetCenterOfMass() -Get the object's center of mass +Returns the prim's center of mass (unless called from the root prim, where it returns the object's center of mass) </string> <string name="LSLTipText_llListSort"> list llListSort(list src, integer stride, integer ascending) -Sort the list into blocks of stride in ascending order if ascending == TRUE. Note that sort only works between same types. +Sorts the list into blocks of stride, in ascending order if ascending == TRUE. +The sort order is affected by type. </string> <string name="LSLTipText_llGetListLength"> integer llGetListLength(list src) -Get the number of elements in the list +Returns the number of elements in the list </string> <string name="LSLTipText_llList2Integer"> integer llList2Integer(list src, integer index) -Copy the integer at index in the list +Copies the integer at index in the list </string> <string name="LSLTipText_llList2Float"> float llList2Float(list src, integer index) -Copy the float at index in the list +Copies the float at index in the list </string> <string name="LSLTipText_llList2String"> string llList2String(list src, integer index) -Copy the string at index in the list +Copies the string at index in the list </string> <string name="LSLTipText_llList2Key"> key llList2Key(list src, integer index) -Copy the key at index in the list +Copies the key at index in the list </string> <string name="LSLTipText_llList2Vector"> vector llList2Vector(list src, integer index) -Copy the vector at index in the list +Copies the vector at index in the list </string> <string name="LSLTipText_llList2Rot"> rotation llList2Rot(list src, integer index) -Copy the rotation at index in the list +Copies the rotation at index in the list </string> <string name="LSLTipText_llList2List"> list llList2List(list src, integer start, integer end) -Copy the slice of the list from start to end +Copies the slice of the list from start to end </string> <string name="LSLTipText_llDeleteSubList"> list llDeleteSubList(list src, integer start, integer end) -Remove the slice from the list and return the remainder +Removes the slice from start to end and returns the remainder of the list </string> <string name="LSLTipText_llGetListEntryType"> integer llGetListEntryType(list src, integer index) @@ -1093,11 +1090,11 @@ Returns the type of the index entry in the list </string> <string name="LSLTipText_llList2CSV"> string llList2CSV(list src) -Create a string of comma separated values from list +Creates a string of comma separated values from list </string> <string name="LSLTipText_llCSV2List"> list llCSV2List(string src) -Create a list from a string of comma separated values +Creates a list from a string of comma separated values </string> <string name="LSLTipText_llListRandomize"> list llListRandomize(list src, integer stride) @@ -1105,80 +1102,83 @@ Returns a randomized list of blocks of size stride </string> <string name="LSLTipText_llList2ListStrided"> list llList2ListStrided(list src, integer start, integer end, integer stride) -Copy the strided slice of the list from start to end +Copies the strided slice of the list from start to end </string> <string name="LSLTipText_llGetRegionCorner"> vector llGetRegionCorner() -Returns a vector with the south west corner x,y position of the region the object is in +Returns a vector in meters that is the global location of the south-west corner of the region which the object is in </string> <string name="LSLTipText_llListInsertList"> list llListInsertList(list dest, list src, integer start) -Inserts src into dest at position start +Returns a list that contains all the elements from dest but with the elements from src inserted at position start </string> <string name="LSLTipText_llListFindList"> integer llListFindList(list src, list test) -Returns the start of the first instance of test in src, -1 if not found +Returns the index of the first instance of test in src. +(Returns -1 if not found) </string> <string name="LSLTipText_llGetObjectName"> string llGetObjectName() -Returns the name of the object script is attached to +Returns the name of the prim which the script is attached to </string> <string name="LSLTipText_llSetObjectName"> llSetObjectName(string name) -Sets the objects name +Sets the prim's name to the name parameter </string> <string name="LSLTipText_llGetDate"> string llGetDate() -Gets the date as YYYY-MM-DD +Returns the current date in the UTC time zone in the format YYYY-MM-DD </string> <string name="LSLTipText_llEdgeOfWorld"> integer llEdgeOfWorld(vector pos, vector dir) -Checks to see whether the border hit by dir from pos is the edge of the world (has no neighboring simulator) +Checks to see whether the border hit by dir from pos is the edge of the world (has no neighboring region) </string> <string name="LSLTipText_llGetAgentInfo"> integer llGetAgentInfo(key id) -Gets information about agent ID. -Returns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING, AGENT_IN_AIR and/or AGENT_AUTOPILOT. +Returns an integer bitfield containing the agent information about id. +Returns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING and/or AGENT_IN_AIR. </string> <string name="LSLTipText_llAdjustSoundVolume"> llAdjustSoundVolume(float volume) -adjusts volume of attached sound (0.0 - 1.0) +Adjusts volume of attached sound (0.0 - 1.0) </string> <string name="LSLTipText_llSetSoundQueueing"> llSetSoundQueueing(integer queue) -determines whether attached sound calls wait for the current sound to finish (0 = no [default], nonzero = yes) +Sets whether attached sounds wait for the current sound to finish (If queue == TRUE then queuing is enabled, if FALSE queuing is disabled [default]) </string> <string name="LSLTipText_llSetSoundRadius"> llSetSoundRadius(float radius) -establishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered) +Establishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered) </string> <string name="LSLTipText_llKey2Name"> string llKey2Name(key id) -Returns the name of the object key, iff the object is in the current simulator, otherwise the empty string +Returns the name of the prim or avatar specified by id. +(The id must be a valid rezzed prim or avatar key in the current simulator, otherwise an empty string is returned.) </string> <string name="LSLTipText_llSetTextureAnim"> llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate) -Animate the texture on the specified face/faces +Animates the texture on the specified face/faces </string> <string name="LSLTipText_llTriggerSoundLimited"> -llTriggerSoundLimited(string sound, float volume, vector tne, vector bsw) -plays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to AABB defined by vectors top-north-east and bottom-south-west +llTriggerSoundLimited(string sound, float volume, vector top_north_east, vector bottom_south_west) +Plays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to the box defined by vectors top_north_east and bottom_south_west </string> <string name="LSLTipText_llEjectFromLand"> -llEjectFromLand(key pest) -Ejects pest from land that you own +llEjectFromLand(key avatar) +Ejects avatar from the parcel </string> <string name="LSLTipText_llParseString2List"> list llParseString2List(string src, list separators, list spacers) -Breaks src into a list, discarding separators, keeping spacers (separators and spacers must be lists of strings, maximum of 8 each) +Breaks src into a list, discarding separators, keeping spacers +(separators and spacers must be lists of strings, maximum of 8 each) </string> <string name="LSLTipText_llOverMyLand"> integer llOverMyLand(key id) -Returns TRUE if id is over land owner of object owns, FALSE otherwise +Returns TRUE if id is over land owned by the script owner, otherwise FALSE </string> <string name="LSLTipText_llGetLandOwnerAt"> key llGetLandOwnerAt(vector pos) -Returns the key of the land owner, NULL_KEY if public +Returns the key of the land owner, returns NULL_KEY if public </string> <string name="LSLTipText_llGetNotecardLine"> key llGetNotecardLine(string name, integer line) @@ -1186,131 +1186,130 @@ Returns line line of notecard name via the dataserver event </string> <string name="LSLTipText_llGetAgentSize"> vector llGetAgentSize(key id) -If the agent is in the same sim as the object, returns the size of the avatar +If the avatar is in the same region, returns the size of the bounding box of the requested avatar by id, otherwise returns ZERO_VECTOR </string> <string name="LSLTipText_llSameGroup"> integer llSameGroup(key id) -Returns TRUE if ID is in the same sim and has the same active group, otherwise FALSE +Returns TRUE if avatar id is in the same region and has the same active group, otherwise FALSE </string> <string name="LSLTipText_llUnSit"> key llUnSit(key id) -If agent identified by id is sitting on the object the script is attached to or is over land owned by the objects owner, the agent is forced to stand up +If avatar identified by id is sitting on the object the script is attached to or is over land owned by the object's owner, the avatar is forced to stand up </string> <string name="LSLTipText_llGroundSlope"> -vector llGroundSlope(vector v) -returns the ground slope below the object position + v +vector llGroundSlope(vector offset) +Returns the ground slope below the object position + offset </string> <string name="LSLTipText_llGroundNormal"> -vector llGroundNormal(vector v) -returns the ground normal below the object position + v +vector llGroundNormal(vector offset) +Returns the ground normal below the object position + offset </string> <string name="LSLTipText_llGroundContour"> -vector llGroundCountour(vector v) -returns the ground contour below the object position + v +vector llGroundCountour(vector offset) +Returns the ground contour direction below the object position + offset </string> <string name="LSLTipText_llGetAttached"> integer llGetAttached() -returns the object attachment point or 0 if not attached +Returns the object's attachment point, or 0 if not attached </string> <string name="LSLTipText_llGetFreeMemory"> integer llGetFreeMemory() -returns the available heap space for the current script +Returns the number of free bytes of memory the script can use </string> <string name="LSLTipText_llGetRegionName"> string llGetRegionName() -returns the current region name +Returns the current region name </string> <string name="LSLTipText_llGetRegionTimeDilation"> float llGetRegionTimeDilation() -returns the current time dilation as a float between 0 and 1 +Returns the current time dilation as a float between 0.0 (full dilation) and 1.0 (no dilation) </string> <string name="LSLTipText_llGetRegionFPS"> float llGetRegionFPS() -returns the mean region frames per second +Returns the mean region frames per second </string> <string name="LSLTipText_llParticleSystem"> llParticleSystem(list rules) -Creates a particle system based on rules. Empty list removes particle system from object. +Creates a particle system based on rules. An empty list removes the particle system. List format is [ rule1, data1, rule2, data2 . . . rulen, datan ] </string> <string name="LSLTipText_llGroundRepel"> llGroundRepel(float height, integer water, float tau) -Critically damps to height if within height*0.5 of level (either above ground level or above the higher of land and water if water == TRUE) +Critically damps to height if within height*0.5 of level (either above ground level, or above the higher of land and water if water == TRUE) </string> <string name="LSLTipText_llGiveInventoryList"> -llGiveInventoryList(key destination, string category, list inventory) -Give inventory to destination in a new category +llGiveInventoryList(key target, string folder, list inventory) +Gives inventory items to target, creating a new folder to put them in </string> <string name="LSLTipText_llSetVehicleType"> llSetVehicleType(integer type) -sets vehicle to one of the default types +Sets the vehicle to one of the default types </string> <string name="LSLTipText_llSetVehicleFloatParam"> llSetVehicleFloatParam(integer param, float value) -sets the specified vehicle float parameter +Sets the specified vehicle float parameter </string> <string name="LSLTipText_llSetVehicleVectorParam"> llSetVehicleVectorParam(integer param, vector vec) -sets the specified vehicle vector parameter +Sets the specified vehicle vector parameter </string> <string name="LSLTipText_llSetVehicleRotationParam"> llSetVehicleVectorParam(integer param, rotation rot) -sets the specified vehicle rotation parameter +Sets the specified vehicle rotation parameter </string> <string name="LSLTipText_llSetVehicleFlags"> llSetVehicleFlags(integer flags) -sets the enabled bits in 'flags' +Sets the enabled bits in 'flags' </string> <string name="LSLTipText_llRemoveVehicleFlags"> llRemoveVehicleFlags(integer flags) -removes the enabled bits in 'flags' +Removes the enabled bits in 'flags' </string> <string name="LSLTipText_llSitTarget"> llSitTarget(vector offset, rotation rot) -Set the sit location for this object (if offset == <0,0,0> clear it) +Sets the sit location for the prim. If offset == <0,0,0> then the sit target is removed. </string> <string name="LSLTipText_llAvatarOnSitTarget"> key llAvatarOnSitTarget() -If an avatar is sitting on the sit target, return the avatar's key, NULL_KEY otherwise +If an avatar is seated on the sit target, returns the avatar's key, otherwise NULL_KEY </string> <string name="LSLTipText_llAddToLandPassList"> llAddToLandPassList(key avatar, float hours) -Add avatar to the land pass list for hours +Adds avatar to the land pass list for hours, or indefinitely if hours is 0 </string> <string name="LSLTipText_llSetTouchText"> llSetTouchText(string text) -Displays text in pie menu that acts as a touch +Displays text rather than the default 'Touch' in the pie menu </string> <string name="LSLTipText_llSetSitText"> llSetSitText(string text) -Displays text rather than sit in pie menu +Displays text rather than the default 'Sit Here' in the pie menu </string> <string name="LSLTipText_llSetCameraEyeOffset"> llSetCameraEyeOffset(vector offset) -Sets the camera eye offset used in this object if an avatar sits on it +Sets the camera eye offset for avatars that sit on the object </string> <string name="LSLTipText_llSetCameraAtOffset"> llSetCameraAtOffset(vector offset) -Sets the camera at offset used in this object if an avatar sits on it +Sets the point the camera is looking at to offset for avatars that sit on the object </string> <string name="LSLTipText_llDumpList2String"> string llDumpList2String(list src, string separator) -Write the list out in a single string using separator between values +Returns the list in a single string, using separator between the entries </string> <string name="LSLTipText_llScriptDanger"> integer llScriptDanger(vector pos) -Returns true if pos is over public land, sandbox land, land that doesn't allow everyone to edit and build, or land that doesn't allow outside scripts +Returns TRUE if pos is over public land, sandbox land, land that doesn't allow everyone to edit and build, or land that doesn't allow outside scripts </string> <string name="LSLTipText_llDialog"> llDialog(key avatar, string message, list buttons, integer chat_channel -Shows a dialog box on the avatar's screen with the message. -Up to 12 strings in the list form buttons. -If a button is clicked, the name is chatted on chat_channel. +Shows a dialog box on the avatar's screen with a message and up to 12 buttons. +If a button is pressed, the avatar says the text of the button label on chat_channel. </string> <string name="LSLTipText_llVolumeDetect"> llVolumeDetect(integer detect) -If detect = TRUE, object becomes phantom but triggers collision_start and collision_end events when other objects start and stop interpenetrating. -Must be applied to the root object. +If detect = TRUE, object works much like Phantom, but triggers collision_start and collision_end events when other objects start and stop interpenetrating. +Must be applied to the root prim. </string> <string name="LSLTipText_llResetOtherScript"> llResetOtherScript(string name) @@ -1318,110 +1317,107 @@ Resets script name </string> <string name="LSLTipText_llGetScriptState"> integer llGetScriptState(string name) -Resets TRUE if script name is running +Returns TRUE if the script name is running </string> <string name="LSLTipText_llRemoteLoadScript"> -Deprecated. Please use llRemoteLoadScriptPin instead. +DEPRECATED! Please use llRemoteLoadScriptPin instead. </string> <string name="LSLTipText_llSetRemoteScriptAccessPin"> llSetRemoteScriptAccessPin(integer pin) -If pin is set to a non-zero number, the task will accept remote script loads via llRemoteLoadScriptPin if it passes in the correct pin. -Othersise, llRemoteLoadScriptPin is ignored. +If pin is set to a non-zero number, allows a prim to have scripts remotely loaded via llRemoteLoadScriptPin when it passes in the correct pin. Otherwise, llRemoteLoadScriptPin is ignored. </string> <string name="LSLTipText_llRemoteLoadScriptPin"> llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param) -If the owner of the object this script is attached can modify target, -they are in the same region, and the matching pin is used, -copy script name onto target, -if running == TRUE, start the script with param. +Copies script name onto target, if the owner of this scripted object can modify target and is in the same region, and the matching pin is used. +If running == TRUE, starts the script with start_param </string> <string name="LSLTipText_llOpenRemoteDataChannel"> llOpenRemoteDataChannel() -Creates a channel to listen for XML-RPC calls. Will trigger a remote_data event with channel id once it is available. +Creates a channel to listen for XML-RPC calls, and will trigger a remote_data event with channel id once it is available </string> <string name="LSLTipText_llSendRemoteData"> key llSendRemoteData(key channel, string dest, integer idata, string sdata) -Send an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata. -A message identifier key is returned. -An XML-RPC reply will trigger a remote_data event and reference the message id. -The message_id is returned. +Sends an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata. +Returns a key that is the message_id for the resulting remote_data events. </string> <string name="LSLTipText_llRemoteDataReply"> llRemoteDataReply(key channel, key message_id, string sdata, integer idata) -Send an XML-RPC reply to message_id on channel with payload of string sdata and integer idata +Sends an XML-RPC reply to message_id on channel with payload of string sdata and integer idata </string> <string name="LSLTipText_llCloseRemoteDataChannel"> llCloseRemoteDataChannel(key channel) -Closes XML-RPC channel. +Closes XML-RPC channel </string> <string name="LSLTipText_llMD5String"> string llMD5String(string src, integer nonce) -Performs a RSA Data Security, Inc. MD5 Message-Digest Algorithm on string with nonce. Returns a 32 character hex string. +Returns a string of 32 hex characters that is a RSA Data Security, Inc. MD5 Message-Digest Algorithm of src with nonce </string> <string name="LSLTipText_llSetPrimitiveParams"> llSetPrimitiveParams(list rules) -Set primitive parameters based on rules. +Sets the prim's parameters according to rules </string> <string name="LSLTipText_llStringToBase64"> string llStringToBase64(string str) -Converts a string to the Base 64 representation of the string. +Converts a string to the Base64 representation of the string </string> <string name="LSLTipText_llBase64ToString"> string llBase64ToString(string str) -Converts a Base 64 string to a conventional string. If the conversion creates any unprintable characters, they are converted to spaces. +Converts a Base64 string to a conventional string. +If the conversion creates any unprintable characters, they are converted to spaces. </string> <string name="LSLTipText_llXorBase64Strings"> string llXorBase64Strings(string s1, string s2) -DEPRECATED! Please use llXorBase64StringsCorrect instead!! Incorrectly performs an exclusive or on two Base 64 strings and returns a Base 64 string. s2 repeats if it is shorter than s1. Retained for backwards compatability. +DEPRECATED! Please use llXorBase64StringsCorrect instead. +Incorrectly performs an exclusive or on two Base64 strings and returns a Base64 string. s2 repeats if it is shorter than s1. Retained for backwards compatability. </string> <string name="LSLTipText_llRemoteDataSetRegion"> llRemoteDataSetRegion() -If an object using remote data channels changes regions, you must call this function to reregister the remote data channels. -You do not need to make this call if you don't change regions. +DEPRECATED! Please use llOpenRemoteDataChannel instead. +If an object using remote data channels changes regions, you must call this function to reregister the remote data channels. This call is not needed if the prim does not change regions. </string> <string name="LSLTipText_llLog10"> float llLog10(float val) -Returns the base 10 log of val if val > 0, otherwise returns 0. +Returns the base 10 logarithm of val. Returns zero if val <= 0. </string> <string name="LSLTipText_llLog"> float llLog(float val) -Returns the base e log of val if val > 0, otherwise returns 0. +Returns the natural logarithm of val. Returns zero if val <= 0. </string> <string name="LSLTipText_llGetAnimationList"> list llGetAnimationList(key id) -Gets a list of all playing animations for avatar id +Returns a list of keys of playing animations for avatar described by id </string> <string name="LSLTipText_llSetParcelMusicURL"> llSetParcelMusicURL(string url) -Sets the streaming audio URL for the parcel object is on +Sets the streaming audio URL for the parcel which the object is on </string> <string name="LSLTipText_llGetRootPosition"> vector llGetRootPosition() -Gets the global position of the root object of the object script is attached to +Returns the position (in region coordinates) of the root prim of the object which the script is attached to </string> <string name="LSLTipText_llGetRootRotation"> rotation llGetRootRotation() -Gets the global rotation of the root object of the object script is attached to +Returns the rotation (relative to the region) of the root prim of the object which the script is attached to </string> <string name="LSLTipText_llGetObjectDesc"> string llGetObjectDesc() -Returns the description of the object the script is attached to +Returns the description of the prim the script is attached to </string> <string name="LSLTipText_llSetObjectDesc"> llSetObjectDesc(string name) -Sets the object's description +Sets the prim's description </string> <string name="LSLTipText_llGetCreator"> key llGetCreator() -Returns the creator of the object +Returns a key for the creator of the prim </string> <string name="LSLTipText_llGetTimestamp"> string llGetTimestamp() -Gets the timestamp in the format: YYYY-MM-DDThh:mm:ss.ff..fZ +Returns the timestamp in the UTC time zone in the format: YYYY-MM-DDThh:mm:ss.ff..fZ </string> <string name="LSLTipText_llSetLinkAlpha"> llSetLinkAlpha(integer linknumber, float alpha, integer face) -If a prim exists in the link chain at linknumber, set face to alpha +If a prim exists in the link chain at linknumber, sets face to alpha </string> <string name="LSLTipText_llGetNumberOfPrims"> integer llGetNumberOfPrims() @@ -1429,11 +1425,11 @@ Returns the number of prims in a link set the script is attached to </string> <string name="LSLTipText_llGetNumberOfNotecardLines"> key llGetNumberOfNotecardLines(string name) -Returns number of lines in notecard 'name' via the dataserver event (cast return value to integer) +Returns number of lines in notecard name via the dataserver event (cast return value to integer) </string> <string name="LSLTipText_llGetBoundingBox"> list llGetBoundingBox(key object) -Returns the bounding box around an object (including any linked prims) relative to the root prim, in a list: [ (vector) min_corner, (vector) max_corner ] +Returns the bounding box around the object (including any linked prims) relative to its root prim, in a list in the format [ (vector) min_corner, (vector) max_corner ] </string> <string name="LSLTipText_llGetGeometricCenter"> vector llGetGeometricCenter() @@ -1441,142 +1437,143 @@ Returns the geometric center of the linked set the script is attached to. </string> <string name="LSLTipText_llGetPrimitiveParams"> list llGetPrimitiveParams(list params) -Gets primitive parameters specified in the params list. +Returns the primitive parameters specified in the params list. </string> <string name="LSLTipText_llIntegerToBase64"> string llIntegerToBase64(integer number) -Big endian encode of of integer as a Base64 string. +Returns a string that is a Base64 big endian encode of number </string> <string name="LSLTipText_llBase64ToInteger"> integer llBase64ToInteger(string str) -Big endian decode of a Base64 string into an integer. +Returns an integer that is the str Base64 decoded as a big endian integer </string> <string name="LSLTipText_llGetGMTclock"> float llGetGMTclock() -Gets the time in seconds since midnight in GMT +Returns the time in seconds since midnight GMT </string> <string name="LSLTipText_llGetSimulatorHostname"> string llGetSimulatorHostname() -Gets the hostname of the machine script is running on (same as string in viewer Help dialog) +Returns the hostname of the machine which the script is running on (same as string in viewer Help dialog) </string> <string name="LSLTipText_llSetLocalRot"> llSetLocalRot(rotation rot) -sets the rotation of a child prim relative to the root prim +Sets the rotation of a child prim relative to the root prim </string> <string name="LSLTipText_llParseStringKeepNulls"> list llParseStringKeepNulls(string src, list separators, list spacers) -Breaks src into a list, discarding separators, keeping spacers (separators and spacers must be lists of strings, maximum of 8 each), keeping any null values generated. +Breaks src into a list, discarding separators, keeping spacers, keeping any null values generated. +(separators and spacers must be lists of strings, maximum of 8 each) </string> <string name="LSLTipText_llRezAtRoot"> llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param) -Instantiate owner's inventory object at pos with velocity vel and rotation rot with start parameter param. -The last selected root object's location will be set to pos +Instantiates owner's inventory object rotated to rot with its root at pos, moving at vel, using param as the start parameter </string> <string name="LSLTipText_llGetObjectPermMask"> integer llGetObjectPermMask(integer mask) -Returns the requested permission mask for the root object the task is attached to. +Returns the requested permission mask for the root object the task is attached to </string> <string name="LSLTipText_llSetObjectPermMask"> llSetObjectPermMask(integer mask, integer value) -Sets the given permission mask to the new value on the root object the task is attached to. +Sets the given permission mask to the new value on the root object the task is attached to </string> <string name="LSLTipText_llGetInventoryPermMask"> integer llGetInventoryPermMask(string item, integer mask) -Returns the requested permission mask for the inventory item. +Returns the requested permission mask for the inventory item </string> <string name="LSLTipText_llSetInventoryPermMask"> llSetInventoryPermMask(string item, integer mask, integer value) -Sets the given permission mask to the new value on the inventory item. +Sets the given permission mask to the new value on the inventory item </string> <string name="LSLTipText_llGetInventoryCreator"> key llGetInventoryCreator(string item) -Returns the key for the creator of the inventory item. +Returns a key for the creator of the inventory item </string> <string name="LSLTipText_llOwnerSay"> llOwnerSay(string msg) -says msg to owner only (if owner in sim) +Says msg to owner only. (Owner must be in the same region.) </string> <string name="LSLTipText_llRequestSimulatorData"> key llRequestSimulatorData(string simulator, integer data) -Requests data about simulator. When data is available the dataserver event will be raised +Requests data about simulator. When data is available the dataserver event will be raised. </string> <string name="LSLTipText_llForceMouselook"> llForceMouselook(integer mouselook) -If mouselook is TRUE any avatar that sits on this object is forced into mouselook mode +If mouselook is TRUE, any avatar that sits upon the prim will be forced into mouselook mode </string> <string name="LSLTipText_llGetObjectMass"> float llGetObjectMass(key id) -Get the mass of the object with key id +Returns the mass of the avatar or object in the region </string> <string name="LSLTipText_llListReplaceList"> list llListReplaceList(list dest, list src, integer start, integer end) -Replaces start through end of dest with src. +Returns a list that is dest with start through end removed and src inserted at start </string> <string name="LSLTipText_llLoadURL"> -llLoadURL(key avatar_id, string message, string url) -Shows dialog to avatar avatar_id offering to load web page at URL. If user clicks yes, launches their web browser. +llLoadURL(key avatar, string message, string url) +Shows a dialog to avatar offering to load the web page at url with a message. +If user clicks yes, launches the page in their web browser. </string> <string name="LSLTipText_llParcelMediaCommandList"> llParcelMediaCommandList(list command) -Sends a list of commands, some with arguments, to a parcel. +Sends a list of commands, some with arguments, to a parcel to control the playback of movies and other media </string> <string name="LSLTipText_llParcelMediaQuery"> list llParcelMediaQuery(list query) -Sends a list of queries, returns a list of results. +Returns a list containing results of the sent query </string> <string name="LSLTipText_llModPow"> integer llModPow(integer a, integer b, integer c) -Returns a raised to the b power, mod c. ( (a**b)%c ). b is capped at 0xFFFF (16 bits). +Returns a raised to the b power, mod c. ( (a**b)%c ) +b is capped at 0xFFFF (16 bits). </string> <string name="LSLTipText_llGetInventoryType"> integer llGetInventoryType(string name) -Returns the type of the inventory name +Returns the type of the inventory item name </string> <string name="LSLTipText_llSetPayPrice"> llSetPayPrice(integer price, list quick_pay_buttons) -Sets the default amount when someone chooses to pay this object. +Sets the default amount on the dialog that appears when someone chooses to pay this prim </string> <string name="LSLTipText_llGetCameraPos"> vector llGetCameraPos() -Gets current camera position for agent task has permissions for. +Returns the current camera position for the agent the task has permissions for </string> <string name="LSLTipText_llGetCameraRot"> rotation llGetCameraRot() -Gets current camera orientation for agent task has permissions for. +Returns the current camera orientation for the agent the task has permissions for </string> <string name="LSLTipText_llSetPrimURL"> llSetPrimURL(string url) -Updates the URL for the web page shown on the sides of the object. +Updates the URL for the web page shown on the sides of the object </string> <string name="LSLTipText_llRefreshPrimURL"> llRefreshPrimURL() -Reloads the web page shown on the sides of the object. +Reloads the web page shown on the sides of the object </string> <string name="LSLTipText_llEscapeURL"> string llEscapeURL(string url) -Returns and escaped/encoded version of url, replacing spaces with %20 etc. +Returns an escaped/encoded version of url, replacing spaces with %20 etc. </string> <string name="LSLTipText_llUnescapeURL"> string llUnescapeURL(string url) -Returns and unescaped/unencoded version of url, replacing %20 with spaces etc. +Returns an unescaped/ unencoded version of url, replacing %20 with spaces etc. </string> <string name="LSLTipText_llMapDestination"> llMapDestination(string simname, vector pos, vector look_at) -Opens world map centered on region with pos highlighted. +Opens the World Map centered on the region simname with pos highlighted. (NOTE: look_at currently does nothing.) Only works for scripts attached to avatar, or during touch events. -(NOTE: look_at currently does nothing) </string> <string name="LSLTipText_llAddToLandBanList"> llAddToLandBanList(key avatar, float hours) -Add avatar to the land ban list for hours +Adds avatar to the land ban list for hours, or indefinitely if hours is 0 </string> <string name="LSLTipText_llRemoveFromLandPassList"> llRemoveFromLandPassList(key avatar) -Remove avatar from the land pass list +Removes avatar from the land pass list </string> <string name="LSLTipText_llRemoveFromLandBanList"> llRemoveFromLandBanList(key avatar) -Remove avatar from the land ban list +Removes avatar from the land ban list </string> <string name="LSLTipText_llSetCameraParams"> llSetCameraParams(list rules) @@ -1585,158 +1582,174 @@ List format is [ rule1, data1, rule2, data2 . . . rulen, datan ] </string> <string name="LSLTipText_llClearCameraParams"> llClearCameraParams() -Resets all camera parameters to default values and turns off scripted camera control. +Resets all camera parameters to default values and turns off scripted camera control </string> <string name="LSLTipText_llListStatistics"> -float llListStatistics(integer operation, list l) -Perform statistical aggregate functions on list l using LIST_STAT_* operations. +float llListStatistics(integer operation, list src) +Performs statistical aggregate functions on list src using LIST_STAT_* operations </string> <string name="LSLTipText_llGetUnixTime"> integer llGetUnixTime() -Get the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock. +Returns the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock </string> <string name="LSLTipText_llGetParcelFlags"> integer llGetParcelFlags(vector pos) -Get the parcel flags (PARCEL_FLAG_*) for the parcel including the point pos. +Returns a mask of the parcel flags (PARCEL_FLAG_*) for the parcel that includes the point pos </string> <string name="LSLTipText_llGetRegionFlags"> integer llGetRegionFlags() -Get the region flags (REGION_FLAG_*) for the region the object is in. +Returns the region flags (REGION_FLAG_*) for the region the object is in </string> <string name="LSLTipText_llXorBase64StringsCorrect"> string llXorBase64StringsCorrect(string s1, string s2) -Correctly performs an exclusive or on two Base 64 strings and returns a Base 64 string. s2 repeats if it is shorter than s1. +Correctly performs an exclusive or on two Base64 strings and returns a Base64 string. +s2 repeats if it is shorter than s1. </string> <string name="LSLTipText_llHTTPRequest"> llHTTPRequest(string url, list parameters, string body) -Send an HTTP request. +Sends an HTTP request to the specified url with the body of the request and parameters </string> <string name="LSLTipText_llResetLandBanList"> llResetLandBanList() -Removes all residents from the land ban list. +Removes all residents from the land ban list </string> <string name="LSLTipText_llResetLandPassList"> llResetLandPassList() -Removes all residents from the land access/pass list. +Removes all residents from the land access/pass list </string> <string name="LSLTipText_llGetObjectPrimCount"> integer llGetObjectPrimCount(key object_id) -Returns the total number of prims for an object. +Returns the total number of prims for an object in the region </string> <string name="LSLTipText_llGetParcelPrimOwners"> list llGetParcelPrimOwners(vector pos) -Returns a list of all residents who own objects on the parcel and the number of objects they own. +Returns a list of all residents who own objects on the parcel at pos and with individual prim counts. Requires owner-like permissions for the parcel. </string> <string name="LSLTipText_llGetParcelPrimCount"> integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide) -Gets the number of prims on the parcel of the given category. -Categories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP. +Returns the number of prims on the parcel at pos of the given category. +Categories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP </string> <string name="LSLTipText_llGetParcelMaxPrims"> integer llGetParcelMaxPrims(vector pos, integer sim_wide) -Gets the maximum number of prims allowed on the parcel at pos. +Returns the maximum number of prims allowed on the parcel at pos </string> <string name="LSLTipText_llGetParcelDetails"> list llGetParcelDetails(vector pos, list params) -Gets the parcel details specified in params for the parcel at pos. +Returns the parcel details specified in params for the parcel at pos. Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA </string> <string name="LSLTipText_llSetLinkPrimitiveParams"> llSetLinkPrimitiveParams(integer linknumber, list rules) -Set primitive parameters for linknumber based on rules. +Sets primitive parameters for linknumber based on rules </string> <string name="LSLTipText_llSetLinkTexture"> -llSetLinkTexture(integer link_pos, string texture, integer face) -Sets the texture of face for link_pos +llSetLinkTexture(integer linknumber, string texture, integer face) +Sets the texture of face for a task that exists in the link chain at linknumber </string> <string name="LSLTipText_llStringTrim"> string llStringTrim(string src, integer trim_type) -Trim leading and/or trailing spaces from a string. -Uses trim_type of STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL. +Trims the leading and/or trailing white spaces from a string. +trim_type can be STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL. </string> <string name="LSLTipText_llRegionSay"> llRegionSay(integer channel, string msg) -broadcasts msg to entire region on channel (not 0.) +Broadcasts msg on channel (not 0) that can be heard anywhere in the region by a script listening on channel </string> <string name="LSLTipText_llGetObjectDetails"> list llGetObjectDetails(key id, list params) -Gets the object details specified in params for the object with key id. -Details are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR. +Returns the object details specified in params for the object with key id. +Params are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR </string> <string name="LSLTipText_llSetClickAction"> llSetClickAction(integer action) -Sets the action performed when a prim is clicked upon. +Sets the action performed when a prim is clicked upon </string> <string name="LSLTipText_llGetRegionAgentCount"> -int llGetRegionAgentCount() -returns the number of agents in a region +integer llGetRegionAgentCount() +Returns the number of avatars in the region </string> <string name="LSLTipText_llTextBox"> llTextBox(key avatar, string message, integer chat_channel -Shows a dialog box on the avatar's screen with the message. -A text box asks for input, and if entered the text is chatted on chat_channel. +Shows a dialog box on the avatar's screen with the message. +It contains a text box for input, and if entered that text is chatted on chat_channel. </string> <string name="LSLTipText_llGetAgentLanguage"> -string llGetAgentLanguage(key id) -Gets the agents preferred language.. +string llGetAgentLanguage(key avatar) +Returns the language code of the preferred interface language of the avatar </string> <string name="LSLTipText_llDetectedTouchUV"> -vector llDetectedTouchUV(integer number) -returns the u and v coordinates in the first two components of a vector, for a triggered touch event +vector llDetectedTouchUV(integer index) +Returns the u and v coordinates in the first two components of a vector, for the texture coordinates where the prim was touched in a triggered touch event </string> <string name="LSLTipText_llDetectedTouchFace"> -integer llDetectedTouchFace(integer number) -returns the index of the face on the object for a triggered touch event +integer llDetectedTouchFace(integer index) +Returns the index of the face where the avatar clicked in a triggered touch event </string> <string name="LSLTipText_llDetectedTouchPos"> -vector llDetectedTouchPos(integer number) -returns the position touched for a triggered touch event +vector llDetectedTouchPos(integer index) +Returns the position where the object was touched in a triggered touch event </string> <string name="LSLTipText_llDetectedTouchNormal"> -vector llDetectedTouchNormal(integer number) -returns the surface normal for a triggered touch event +vector llDetectedTouchNormal(integer index) +Returns the surface normal for a triggered touch event </string> <string name="LSLTipText_llDetectedTouchBinormal"> -vector llDetectedTouchBinormal(integer number) -returns the surface binormal for a triggered touch event +vector llDetectedTouchBinormal(integer index) +Returns the surface binormal for a triggered touch event </string> <string name="LSLTipText_llDetectedTouchST"> -vector llDetectedTouchST(integer number) -returns the s and t coordinates in the first two components of a vector, for a triggered touch event +vector llDetectedTouchST(integer index) +Returns the s and t coordinates in the first two components of a vector, for the surface coordinates where the prim was touched in a triggered touch event </string> <string name="LSLTipText_llSHA1String"> -string llSHA1String(string sr) -Performs a SHA1 security Hash. Returns a 40 character hex string. +string llSHA1String(string src) +Returns a string of 40 hex characters that is the SHA1 security Hash of src </string> <string name="LSLTipText_llGetFreeURLs"> integer llGetFreeURLs() -returns the available urls for the current script +Returns the number of available URLs for the current script </string> <string name="LSLTipText_llRequestURL"> key llRequestURL() -Requests one HTTP:// url for use by this object -Triggers an http_server event with results. +Requests one HTTP:// url for use by this object. +An http_request event is triggered with the results. </string> <string name="LSLTipText_llRequestSecureURL"> key llRequestSecureURL() -Requests one HTTPS:// (SSL) url for use by this object -Triggers an http_server event with results. +Requests one HTTPS:// (SSL) url for use by this object. +An http_request event is triggered with the results. </string> <string name="LSLTipText_llReleaseURL"> llReleaseURL(string url) -Releases the specified URL, it will no longer be usable. +Releases the specified URL, it will no longer be usable </string> <string name="LSLTipText_llHTTPResponse"> -llHTTPResponse(key id, integer status, string body) -Responds to request id with status and body. - </string> +llHTTPResponse(key request_id, integer status, string body) +Responds to request_id with status and body + </string> <string name="LSLTipText_llGetHTTPHeader"> -string llGetHTTPHeader(key id, string header) -Get the value for header for request id. - </string> - - <!-- Avatar busy/away mode --> +string llGetHTTPHeader(key request_id, string header) +Returns the value for header for request_id + </string> + <string name="LSLTipText_llSetPrimMediaParams"> +llSetPrimMediaParams(integer face, list params) +Sets the media params for a particular face on an object. If media is not already on this object, add it. +List is a set of name/value pairs in no particular order. Params not specified are unchanged, or if new media is added then set to the default specified. +The possible names are below, along with the types of values and what they mean. + </string> + <string name="LSLTipText_llGetPrimMediaParams"> +list llGetPrimMediaParams(integer face, list params) +Returns the media params for a particular face on an object, given the desired list of names, in the order requested. +(Returns an empty list if no media exists on the face.) + </string> + <string name="LSLTipText_llClearPrimMedia"> +llClearPrimMedia(integer face) +Clears (deletes) the media and all params from the given face. + </string> + + <!-- Avatar busy/away mode --> <string name="AvatarSetNotAway">Set Not Away</string> <string name="AvatarSetAway">Set Away</string> <string name="AvatarSetNotBusy">Set Not Busy</string> diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index cb876da8d8..824a815a99 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml @@ -10,9 +10,9 @@ highlighted_color="ScrollHighlightedColor" column_padding="5" draw_stripes="true" + scroll_bar_bg_visible="false" + scroll_bar_bg_color="black" background_visible="false" heading_height="23" draw_border="false" - draw_heading="false" - scroll_bar_bg_visible="false" - scroll_bar_bg_color="black" /> + draw_heading="false" /> 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 6e73e997e0..e998635d20 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 @@ -12,17 +12,20 @@ <combo_editor select_on_focus="true" text_pad_left="20" + tool_tip="Search" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" background_image_focused="TextField_Search_Active"/> <combo_list multi_select="false" - page_lines="10" /> + page_lines="10" + scroll_bar_bg_visible="true" /> <search_button label="" top_pad="4" left_pad="4" width="13" height="13" + tool_tip="Search" image_unselected="Search" image_selected="Search" /> </search_combo_box>
\ No newline at end of file |
