From feabeb496518f28359f654fdc397354355743589 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Wed, 30 Sep 2009 17:46:31 +0000 Subject: DEV-35039 Viewer 2.0 Help System - Viewer Development svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3 --- .../default/html/en-us/help-offline/index.html | 29 ++++ indra/newview/skins/default/textures/textures.xml | 14 +- .../textures/windows/Icon_Restore_Foreground.png | Bin 0 -> 2955 bytes .../textures/windows/Icon_Restore_Press.png | Bin 0 -> 2971 bytes .../newview/skins/default/xui/en/floater_about.xml | 1 + .../skins/default/xui/en/floater_help_browser.xml | 165 ++------------------- indra/newview/skins/default/xui/en/menu_viewer.xml | 18 --- .../newview/skins/default/xui/en/notifications.xml | 62 -------- .../skins/default/xui/en/panel_script_ed.xml | 4 +- .../default/xui/en/panel_side_tray_tab_caption.xml | 13 ++ indra/newview/skins/default/xui/en/strings.xml | 1 - 11 files changed, 58 insertions(+), 249 deletions(-) create mode 100644 indra/newview/skins/default/html/en-us/help-offline/index.html create mode 100644 indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png create mode 100644 indra/newview/skins/default/textures/windows/Icon_Restore_Press.png (limited to 'indra/newview/skins/default') 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 @@ + + + +Offline Help + + + +
+

+ Second Life Offline Help. +

+

+ 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. +

+
+ + diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 46c294768d..66ea444c15 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -110,12 +110,10 @@ - - @@ -125,16 +123,16 @@ - - - + + + @@ -442,8 +440,6 @@ - - @@ -493,10 +489,6 @@ - - - - diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png new file mode 100644 index 0000000000..1e753aaf1d Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png differ diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png new file mode 100644 index 0000000000..be66b05230 Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png differ 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_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 @@ + title="Help Browser" + width="620"> http://www.secondlife.com @@ -20,150 +20,13 @@ http://support.secondlife.com - - diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 13a53a4ce3..0f7afcba6e 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -93,7 +93,6 @@ Restore Minimize Tear Off - Edit Dock Undock Show Help -- cgit v1.2.3 From a0596b4d5c0c0aa7a9dfb88ad5d28d28a0c86fa9 Mon Sep 17 00:00:00 2001 From: Ramzi Ramey Date: Wed, 30 Sep 2009 18:15:37 +0000 Subject: DEV-40452 VWR-15527: Correct small errors and linguistic consistency in the LSL editor tooltips - also fixes the specific cases of VWR-3766, VWR-1794 - string changes only, NO CODE changed. - this is needed so that we can begin the Localization round --- indra/newview/skins/default/xui/en/strings.xml | 773 ++++++++++++------------- 1 file changed, 386 insertions(+), 387 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 0f7afcba6e..311bf0503a 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -307,112 +307,115 @@ Sleeps script for [SLEEP_TIME] seconds. float llSin(float theta) -theta in radians +Returns the sine of theta (theta in radians) float llCos(float theta) -theta in radians +Returns the cosine of theta (theta in radians) float llTan(float theta) -theta radians +Returns the tangent of theta (theta in radians) float llAtan2(float y, float x) +Returns the arctangent2 of y, x 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 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 integer llAbs(integer val) +Returns the positive version of val float llFabs(float val) +Returns the positive version of val float llFrand(float mag) -returns random number in range [0,mag) +Returns a pseudo random number in the range [0,mag) or (mag,0] integer llFloor(float val) -returns largest integer value <= val +Returns largest integer value <= val integer llCeil(float val) -returns smallest integer value >= val +Returns smallest integer value >= val integer llRound(float val) -returns val rounded to the nearest integer +Returns val rounded to the nearest integer float llVecMag(vector v) -returns the magnitude of v +Returns the magnitude of v vector llVecNorm(vector v) -returns the v normalized +Returns the v normalized float llVecDist(vector v1, vector v2) -returns the 3D distance between v1 and v2 +Returns the 3D distance between v1 and v2 vector llRot2Euler(rotation q) -returns the Euler representation (roll, pitch, yaw) of q +Returns the Euler representation (roll, pitch, yaw) of q rotation llEuler2Rot(vector v) -returns the rotation representation of Euler Angles v +Returns the rotation representation of Euler Angles v rotation llAxes2Rot(vector fwd, vector left, vector up) -returns the rotation defined by the coordinate axes +Returns the rotation defined by the coordinate axes vector llRot2Fwd(rotation q) -returns the forward vector defined by q +Returns the forward vector defined by q vector llRot2Left(rotation q) -returns the left vector defined by q +Returns the left vector defined by q vector llRot2Up(rotation q) -returns the up vector defined by q +Returns the up vector defined by q rotation llRotBetween(vector v1, vector v2) -returns the rotation to rotate v1 to v2 +Returns the rotation to rotate v1 to v2 llWhisper(integer channel, string msg) -whispers msg on channel +Whispers the text of msg on channel llSay(integer channel, string msg) -says msg on channel +Says the text of msg on channel llShout(integer channel, string msg) -shouts msg on channel +Shouts the text of msg on channel 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 llListenControl(integer number, integer active) -makes a listen event callback active or inactive +Makes a listen event callback active or inactive llListenRemove(integer number) -removes listen event callback number +Removes listen event callback number llSensor(string name, key id, integer type, float range, float arc) @@ -420,43 +423,43 @@ Performs a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or 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 llSensorRemove() -removes sensor +Removes the sensor setup by llSensorRepeat 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) 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) 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) 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) 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) 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) 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) 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) integer llDetectedGroup(integer number) @@ -464,127 +467,127 @@ Returns TRUE if detected object is part of same group as owner 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 llDie() -deletes the object +Deletes the object -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 -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 -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 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 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) llSetScale(vector scale) -sets the scale +Sets the scale of the prim vector llGetScale() -gets the scale +Returns the scale of the prim llSetColor(vector color, integer face) -sets the color +Sets the color on face of the prim float llGetAlpha(integer face) -gets the alpha +Returns the alpha of face llSetAlpha(float alpha, integer face) -sets the alpha +Sets the alpha on face vector llGetColor(integer face) -gets the color +Returns the color on face llSetTexture(string texture, integer face) -sets the texture of face +Sets the texture of face or ALL_SIDES -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 -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 llRotateTexture(float rotation, integer face) -sets the texture rotation for the chosen face +Sets the texture rotation for the chosen face 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) 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) vector llGetPos() -gets the position (if the script isn't physical) +Returns the position of the task in region coordinates vector llGetLocalPos() -gets the position relative to the root (if the script isn't physical) +Returns the position relative to the root llSetRot(rotation rot) -sets the rotation (if the script isn't physical) +Sets the rotation rotation llGetRot() -gets the rotation (if the script isn't physical) +Returns the rotation relative to the region's axes rotation llGetLocalRot() -gets the rotation local to the root (if the script isn't physical) +Returns the rotation local to the root 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 vector llGetForce() -gets the force (if the script is physical) +Returns the force (if the script is physical) 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 llTargetRemove(integer number) -removes target number +Removes positional target number registered with llTarget 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 llRotTargetRemove(integer number) -removes rotational target number +Removes rotational target number registered with llRotTarget 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) llStopMoveToTarget() @@ -592,83 +595,83 @@ Stops critically damped motion 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 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 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 vector llGetTorque() -gets the torque (if the script is physical) +Returns the torque (if the script is physical) 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 vector llGetVel() -gets the velocity +Returns the velocity of the object vector llGetAccel() -gets the acceleration +Returns the acceleration of the object relative to the region's axes vector llGetOmega() -gets the omega +Returns the rotation velocity in radians per second 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 float llGetWallclock() -gets the time in seconds since midnight +Returns the time in seconds since midnight California Pacific time (PST/PDT) 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 llResetTime() -sets the time to zero +Sets the script timer to zero 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 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 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) 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) 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 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 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 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 llStopSound() @@ -676,143 +679,143 @@ Stops currently attached sound llPreloadSound(string sound) -preloads a sound on viewers within range +Preloads a sound on viewers within range string llGetSubString(string src, integer start, integer end) -returns the indicated substring +Returns the indicated substring 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 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 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 llToLower(string src) -convert src to all lower case and returns the result +Returns a string that is src with all lower-case characters llGiveMoney(key destination, integer amount) -transfer amount of money from script owner to destination +Transfers amount of L$ from script owner to destination 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 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 llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset) -Make smoke like particles +Makes smoke like particles llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset) -Make fire like particles +Makes fire like particles 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 -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 llStopLookAt() -Stop causing object name to point at a target +Stops causing object to point at a target 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 llSleep(float sec) -Put script to sleep for sec seconds +Puts the script to sleep for sec seconds float llGetMass() -Get the mass of task name that script is attached to +Returns the mass of object that the script is attached to 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 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 llReleaseControls() -Stop taking inputs +Stops taking inputs that were taken with llTakeControls -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 llDetachFromAvatar() -Drop off of avatar +Detaches object from avatar llTakeCamera(key avatar) -Move avatar's viewpoint to task +Moves avatar's viewpoint to task llReleaseCamera(key avatar) -Return camera to agent +Returns camera to agent avatar key llGetOwner() -Returns the owner of the task +Returns the object owner's UUID llInstantMessage(key user, string message) -IMs message to the user +Sends the specified string as an Instant Message to the user 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 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 key llGetKey() -Get the key for the task the script is attached to +Returns the key of the prim the script is attached to 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) 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 llStopHover() -Stop hovering to a height +Stops hovering to a height llMinEventDelay(float delay) -Set the minimum time between events being handled +Sets the minimum time between events being handled llSoundPreload(string sound) -preloads a sound on viewers within range +Preloads a sound on viewers within range -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 integer llStringLength(string str) @@ -820,84 +823,83 @@ Returns the length of string 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 llStopAnimation(string anim) -Stop animation anim for agent that owns object +Stops animation anim for agent that granted permission llPointAt(vector pos) -Make agent that owns object point at pos +Makes agent that owns object point at pos llStopPointAt() -Stop agent that owns object pointing +Stops pointing agent that owns object 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 integer llGetStartParameter() -Get's the start paramter passed to llRezObject +Returns an integer that is the script start/rez parameter 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 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 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 integer llGetPermissions() -return what permissions have been enabled +Returns an integer bitfield with the permissions that have been granted 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) 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 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 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) 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) -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 llGetLinkName(integer linknum) -Get the name of linknumber in link set +string llGetLinkName(integer linknumber) +Returns the name of linknumber in a link set 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 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 llSetScriptState(string name, integer run) -Control the state of a script name. +Sets the running state of the specified script float llGetEnergy() @@ -905,56 +907,55 @@ Returns how much energy is in the object as a percentage of maximum llGiveInventory(key destination, string inventory) -Give inventory to destination +Gives inventory to destination -llRemoveInventory(string inventory) -Remove the named inventory item +llRemoveInventory(string item) +Removes the named inventory item 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 -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 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 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. 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. 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. 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 -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 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 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 llGetAnimation(key id) -Get the currently playing locomotion animation for avatar id +Returns the name of the currently playing locomotion animation for avatar id llResetScript() @@ -962,12 +963,7 @@ Resets the script 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. llPushObject(key id, vector impulse, vector ang_impulse, integer local) @@ -975,19 +971,19 @@ Applies impulse and ang_impulse to object id 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) -llGetScriptName() -Returns the script name +string llGetScriptName() +Returns the name of the script that this function is used in integer llGetNumberOfSides() -Returns the number of sides +Returns the number of faces (or sides) of the prim rotation llAxisAngle2Rot(vector axis, float angle) -Returns the rotation generated angle about axis +Returns the rotation that is a generated angle about axis vector llRot2Axis(rotation rot) @@ -1011,19 +1007,19 @@ Returns angle between rotation a and b key llGetInventoryKey(string name) -Returns the key of the inventory name +Returns the key that is the UUID of the inventory name 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 vector llGetSunDirection() -Returns the sun direction on the simulator +Returns a normalized vector of the direction of the sun in the region -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 vector llGetTextureScale(integer side) @@ -1035,55 +1031,57 @@ Returns the texture rotation of side 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) key llGetOwnerKey(key id) -Find the owner of id +Returns the owner of object id 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) 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. integer llGetListLength(list src) -Get the number of elements in the list +Returns the number of elements in the list integer llList2Integer(list src, integer index) -Copy the integer at index in the list +Copies the integer at index in the list float llList2Float(list src, integer index) -Copy the float at index in the list +Copies the float at index in the list string llList2String(list src, integer index) -Copy the string at index in the list +Copies the string at index in the list key llList2Key(list src, integer index) -Copy the key at index in the list +Copies the key at index in the list vector llList2Vector(list src, integer index) -Copy the vector at index in the list +Copies the vector at index in the list rotation llList2Rot(list src, integer index) -Copy the rotation at index in the list +Copies the rotation at index in the list 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 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 integer llGetListEntryType(list src, integer index) @@ -1092,11 +1090,11 @@ Returns the type of the index entry in the list string llList2CSV(list src) -Create a string of comma separated values from list +Creates a string of comma separated values from list list llCSV2List(string src) -Create a list from a string of comma separated values +Creates a list from a string of comma separated values list llListRandomize(list src, integer stride) @@ -1104,80 +1102,83 @@ Returns a randomized list of blocks of size stride 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 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 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 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 llGetObjectName() -Returns the name of the object script is attached to +Returns the name of the prim which the script is attached to llSetObjectName(string name) -Sets the objects name +Sets the prim's name to the name parameter string llGetDate() -Gets the date as YYYY-MM-DD +Returns the current date in the UTC time zone in the format YYYY-MM-DD 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) 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. llAdjustSoundVolume(float volume) -adjusts volume of attached sound (0.0 - 1.0) +Adjusts volume of attached sound (0.0 - 1.0) 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]) 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 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.) 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 -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 -llEjectFromLand(key pest) -Ejects pest from land that you own +llEjectFromLand(key avatar) +Ejects avatar from the parcel 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) 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 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 key llGetNotecardLine(string name, integer line) @@ -1185,131 +1186,130 @@ Returns line line of notecard name via the dataserver event 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 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 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 -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 -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 -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 integer llGetAttached() -returns the object attachment point or 0 if not attached +Returns the object's attachment point, or 0 if not attached integer llGetFreeMemory() -returns the available heap space for the current script +Returns the number of free bytes of memory the script can use string llGetRegionName() -returns the current region name +Returns the current region name 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) float llGetRegionFPS() -returns the mean region frames per second +Returns the mean region frames per second 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 ] 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) -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 llSetVehicleType(integer type) -sets vehicle to one of the default types +Sets the vehicle to one of the default types llSetVehicleFloatParam(integer param, float value) -sets the specified vehicle float parameter +Sets the specified vehicle float parameter llSetVehicleVectorParam(integer param, vector vec) -sets the specified vehicle vector parameter +Sets the specified vehicle vector parameter llSetVehicleVectorParam(integer param, rotation rot) -sets the specified vehicle rotation parameter +Sets the specified vehicle rotation parameter llSetVehicleFlags(integer flags) -sets the enabled bits in 'flags' +Sets the enabled bits in 'flags' llRemoveVehicleFlags(integer flags) -removes the enabled bits in 'flags' +Removes the enabled bits in 'flags' 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. 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 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 llSetTouchText(string text) -Displays text in pie menu that acts as a touch +Displays text rather than the default 'Touch' in the pie menu llSetSitText(string text) -Displays text rather than sit in pie menu +Displays text rather than the default 'Sit Here' in the pie menu 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 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 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 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 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. 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. llResetOtherScript(string name) @@ -1317,110 +1317,107 @@ Resets script name integer llGetScriptState(string name) -Resets TRUE if script name is running +Returns TRUE if the script name is running -Deprecated. Please use llRemoteLoadScriptPin instead. +DEPRECATED! Please use llRemoteLoadScriptPin instead. 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. 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 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 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. 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 llCloseRemoteDataChannel(key channel) -Closes XML-RPC channel. +Closes XML-RPC channel 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 llSetPrimitiveParams(list rules) -Set primitive parameters based on rules. +Sets the prim's parameters according to rules 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 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 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. 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. 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. 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. 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 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 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 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 llGetObjectDesc() -Returns the description of the object the script is attached to +Returns the description of the prim the script is attached to llSetObjectDesc(string name) -Sets the object's description +Sets the prim's description key llGetCreator() -Returns the creator of the object +Returns a key for the creator of the prim 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 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 integer llGetNumberOfPrims() @@ -1428,11 +1425,11 @@ Returns the number of prims in a link set the script is attached to 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) 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 ] vector llGetGeometricCenter() @@ -1440,142 +1437,143 @@ Returns the geometric center of the linked set the script is attached to. list llGetPrimitiveParams(list params) -Gets primitive parameters specified in the params list. +Returns the primitive parameters specified in the params list. 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 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 float llGetGMTclock() -Gets the time in seconds since midnight in GMT +Returns the time in seconds since midnight GMT 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) 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 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) 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 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 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 integer llGetInventoryPermMask(string item, integer mask) -Returns the requested permission mask for the inventory item. +Returns the requested permission mask for the inventory item 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 key llGetInventoryCreator(string item) -Returns the key for the creator of the inventory item. +Returns a key for the creator of the inventory item llOwnerSay(string msg) -says msg to owner only (if owner in sim) +Says msg to owner only. (Owner must be in the same region.) 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. 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 float llGetObjectMass(key id) -Get the mass of the object with key id +Returns the mass of the avatar or object in the region 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 -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. 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 list llParcelMediaQuery(list query) -Sends a list of queries, returns a list of results. +Returns a list containing results of the sent query 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). integer llGetInventoryType(string name) -Returns the type of the inventory name +Returns the type of the inventory item name 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 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 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 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 llRefreshPrimURL() -Reloads the web page shown on the sides of the object. +Reloads the web page shown on the sides of the object 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 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. 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) 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 llRemoveFromLandPassList(key avatar) -Remove avatar from the land pass list +Removes avatar from the land pass list llRemoveFromLandBanList(key avatar) -Remove avatar from the land ban list +Removes avatar from the land ban list llSetCameraParams(list rules) @@ -1584,155 +1582,156 @@ List format is [ rule1, data1, rule2, data2 . . . rulen, datan ] 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 -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 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 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 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 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. 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 llResetLandBanList() -Removes all residents from the land ban list. +Removes all residents from the land ban list llResetLandPassList() -Removes all residents from the land access/pass list. +Removes all residents from the land access/pass list 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 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. 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 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 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 llSetLinkPrimitiveParams(integer linknumber, list rules) -Set primitive parameters for linknumber based on rules. +Sets primitive parameters for linknumber based on rules -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 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. 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 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 llSetClickAction(integer action) -Sets the action performed when a prim is clicked upon. +Sets the action performed when a prim is clicked upon -int llGetRegionAgentCount() -returns the number of agents in a region +integer llGetRegionAgentCount() +Returns the number of avatars in the region 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 llGetAgentLanguage(key id) -Gets the agents preferred language.. +string llGetAgentLanguage(key avatar) +Returns the language code of the preferred interface language of the avatar -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 -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 -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 -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 -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 -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 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 integer llGetFreeURLs() -returns the available urls for the current script +Returns the number of available URLs for the current script 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. 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. llReleaseURL(string url) -Releases the specified URL, it will no longer be usable. +Releases the specified URL, it will no longer be usable -llHTTPResponse(key id, integer status, string body) -Responds to request id with status and body. +llHTTPResponse(key request_id, integer status, string body) +Responds to request_id with status and body -string llGetHTTPHeader(key id, string header) -Get the value for header for request id. +string llGetHTTPHeader(key request_id, string header) +Returns the value for header for request_id -- cgit v1.2.3 From 6519828508cd0f9feee8154a6412c474bea046de Mon Sep 17 00:00:00 2001 From: Ramzi Ramey Date: Wed, 30 Sep 2009 21:59:50 +0000 Subject: DEV-14830 add'l fix Copy-paste caused duplicate control and widget names in the script errors checkbox & radio buttons; Need to fix this before code is written for it. Need a unique name= for localization --- indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins/default') 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"/> Date: Thu, 1 Oct 2009 02:02:31 +0000 Subject: L10N: typo and inconsistency in a tooltip of panel_login.xml --- indra/newview/skins/default/xui/en/panel_login.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index e7fb3fa208..f2a7dc11c7 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -52,7 +52,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" /> Date: Thu, 1 Oct 2009 02:35:53 +0000 Subject: svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0. --- .../default/xui/en/floater_media_settings.xml | 20 ++ .../newview/skins/default/xui/en/floater_tools.xml | 249 ++++++++++++++++----- .../default/xui/en/floater_whitelist_entry.xml | 24 ++ .../newview/skins/default/xui/en/notifications.xml | 41 ++++ indra/newview/skins/default/xui/en/panel_login.xml | 3 +- .../xui/en/panel_media_settings_general.xml | 199 ++++++++++++++++ .../xui/en/panel_media_settings_permissions.xml | 49 ++++ .../xui/en/panel_media_settings_security.xml | 56 +++++ indra/newview/skins/default/xui/en/strings.xml | 18 +- 9 files changed, 592 insertions(+), 67 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/floater_media_settings.xml create mode 100644 indra/newview/skins/default/xui/en/floater_whitelist_entry.xml create mode 100644 indra/newview/skins/default/xui/en/panel_media_settings_general.xml create mode 100644 indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml create mode 100644 indra/newview/skins/default/xui/en/panel_media_settings_security.xml (limited to 'indra/newview/skins/default') 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 @@ + + + + + width="134"> + + + + + name="checkbox edit linked parts" > + + + + height="22" > + + Transparency % @@ -2261,7 +2306,7 @@ layout="topleft" left_delta="0" name="glow label" - top_pad="4" + top_pad="2" width="80"> Glow @@ -2281,7 +2326,7 @@ layout="topleft" left_delta="0" name="checkbox fullbright" - top_pad="7" + top_pad="4" width="81" /> Mapping @@ -2439,6 +2484,40 @@ name="weave" value="weave" /> + Repeats per Face @@ -2461,7 +2540,7 @@ left="20" max_val="100" name="TexScaleU" - top_pad="10" + top_pad="6" width="160" /> - - Rotation (degrees) - + - - Repeats Per Meter - + top_delta="25" + width="170" /> + + top_delta="20" + width="170" /> + + - + + + + + Enter a URL or URL pattern to add to the list of allowed domains + + + + + + + + + + Preview + + + + Controls: + + + + Standard + + + Mini + + + + + + + + + + + + + + Note: Parcel Owners & Residents can override this setting + + + + + Size: + + + + X + + + + 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 @@ + + + + + Owner + + + + + + + Group + + + + + + + + Anyone + + + + + + 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 @@ + + + + + + + diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 311bf0503a..13b1ec7308 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1728,13 +1728,25 @@ Releases the specified URL, it will no longer be usable llHTTPResponse(key request_id, integer status, string body) Responds to request_id with status and body - + string llGetHTTPHeader(key request_id, string header) Returns the value for header for request_id - - + +llSetPrimMediaParams(integer face, list params) +Set the media params for a particular face on an object. List is a set of name/value pairs (in no particular order). The possible names are below, along with the types of values and what they mean. If media is not already on this object, add it. Params not specified are unchanged, or if new media is added set to the default specified. + + +list llGetPrimMediaParams(integer face, list params) +Get the media params for a particular face on an object, given the desired list of names. Returns a list of values in the order requested. Returns an empty list if no media exists on the face. + + +llClearPrimMedia(integer face) +Clears (deletes) the media and all params from the given face. + + + Set Not Away Set Away Set Not Busy -- cgit v1.2.3 From f05df68656d2abdc38d86cd6746398fa90eb8614 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 1 Oct 2009 17:44:44 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 * Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816 * Major Bugs: EXT-1142 (timeout during login due to processing group IMs) * Changes: EXT-1216 (minimize message well) --- indra/newview/skins/default/xui/en/floater_sys_well.xml | 12 ++++++------ indra/newview/skins/default/xui/en/menu_viewer.xml | 4 ++-- indra/newview/skins/default/xui/en/panel_bottomtray.xml | 3 --- .../skins/default/xui/en/panel_group_info_sidetray.xml | 3 ++- indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml | 2 ++ indra/newview/skins/default/xui/en/panel_notes.xml | 4 ++-- indra/newview/skins/default/xui/en/panel_picks.xml | 4 ++-- indra/newview/skins/default/xui/en/panel_profile.xml | 6 ++++-- indra/newview/skins/default/xui/en/panel_profile_view.xml | 4 ++-- .../newview/skins/default/xui/en/panel_teleport_history.xml | 2 +- indra/newview/skins/default/xui/en/widgets/scroll_list.xml | 6 +++--- .../skins/default/xui/en/widgets/search_combo_box.xml | 5 ++++- 12 files changed, 30 insertions(+), 25 deletions(-) (limited to 'indra/newview/skins/default') 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 @@ + height="0" + width="318"/> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 648c3458e0..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" /> + layout="topleft"/> + function="World.SetBusy"/> @@ -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" /> (Loading...)