2 files changed, 60 insertions, 4 deletions

diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index 0342c97..7fa7b70 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -458,6 +458,15 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llHTTPResponse", NULL, "kis", "llHTTPResponse(key id, integer status, string body)\nResponds to request id with status and body."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetHTTPHeader", "s", "ks", "string llGetHTTPHeader(key id, string header)\nGet the value for header for request id."));
 
+        // Prim media functions and those added in SL server 1.38 -- MC
+        addFunction(new LLScriptLibraryFunction(10.f, 1.0f, dummy_func, "llSetPrimMediaParams", "i", "il", "llSetPrimMediaParams(integer face, list params)\nSets the media params for a particular face on an object. If media is not already on this object, add it.\nList 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.\nThe possible names are below, along with the types of values and what they mean."));
+        addFunction(new LLScriptLibraryFunction(10.f, 1.0f, dummy_func, "llGetPrimMediaParams", "l", "il", "list llGetPrimMediaParams(integer face, list params)\nReturns the media params for a particular face on an object, given the desired list of names, in the order requested.\n(Returns an empty list if no media exists on the face.)"));
+        addFunction(new LLScriptLibraryFunction(10.f, 1.0f, dummy_func, "llClearPrimMedia", "i", "i", "llClearPrimMedia(integer face)\nClears (deletes) the media and all params from the given face."));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetLinkPrimitiveParamsFast", NULL, "il", "llSetLinkPrimitiveParamsFast(integer linknumber, list rules);\nIdentical to llSetLinkPrimitiveParams except with no script delay."));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetLinkPrimitiveParams", NULL, "il", "list llGetLinkPrimitiveParams(integer link, list params)\nSimilar to llGetPrimitiveParams except works for any prim in the link set and with no script delay."));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llLinkParticleSystem", NULL, "il", "llLinkParticleSystem(integer link, list params)\nSimilar to llParticleSystem except works for any prim in the link set."));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetLinkTextureAnim", NULL, "iiiiifff", "llSetLinkTextureAnim(integer link, integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate);\nSimilar to llSetTextureAnim except works for any prim in the link set"));
+
         // energy, sleep, dummy_func, name, return type, parameters, help text, gods-only
 
         // IF YOU ADD NEW SCRIPT CALLS, YOU MUST PUT THEM AT THE END OF THIS LIST.
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 18af407..b0851ef 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -40,14 +40,14 @@ not_at_rot_target	not_at_rot_target():Result of LLRotTarget library function cal
 money                   money(key id, integer amount):Triggered when L$ is given to task
 email                   email(string time, string address, string subj, string message, integer num_left):Triggered when task receives email
 run_time_permissions    run_time_permissions(integer perm):Triggered when an agent grants run time permissions to task
-attach                  attach(key id):Triggered when an agent attaches or detaches from agent
+attach                  attach(key id):Triggered when task attaches or detaches from agent
 dataserver      dataserver(key queryid, string data):Triggered when task receives asynchronous data
 moving_start    moving_start():Triggered when task begins moving
 moving_end              moving_end():Triggered when task stops moving
 on_rez                  on_rez(integer start_param):Triggered when task is rezed in from inventory or another task
 object_rez              object_rez(key id):Triggered when task rezes in another task
 link_message    link_message(integer sender_num, integer num, string str, key id):Triggered when task receives a link message via LLMessageLinked library function call
-changed                 changed( integer change ):Triggered various event change the task:(test change with CHANGED_INVENTORY, CHANGED_COLOR, CHANGED_SHAPE, CHANGED_SCALE, CHANGED_TEXTURE, CHANGED_LINK, CHANGED_ALLOWED_DROP, CHANGED_OWNER, CHANGED_REGION, CHANGED_TELEPORT)
+changed                 changed( integer change ):Triggered various event change the task:(test change with CHANGED_INVENTORY, CHANGED_COLOR, CHANGED_SHAPE, CHANGED_SCALE, CHANGED_TEXTURE, CHANGED_LINK, CHANGED_ALLOWED_DROP, CHANGED_OWNER, CHANGED_REGION, CHANGED_TELEPORT, CHANGED_REGION_START, CHANGED_MEDIA)
 remote_data     remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
 http_response   http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
 http_request    http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
@@ -108,6 +108,7 @@ AGENT_TYPING		Returned by llGetAgentInfo if the Agent is typing
 AGENT_CROUCHING         Returned by llGetAgentInfo if the Agent is crouching
 AGENT_BUSY                      Returned by llGetAgentInfo if the Agent is busy
 AGENT_ALWAYS_RUN        Returned by llGetAgentInfo if the Agent has 'Always Run' enabled
+AGENT_AUTOPILOT         Returned by llGetAgentInfo if the Agent is under autopilot control
 
 PSYS_PART_FLAGS
 PSYS_PART_START_COLOR
@@ -319,6 +320,7 @@ CHANGED_OWNER		Parameter of changed event handler used to indicate change to tas
 CHANGED_REGION          Parameter of changed event handler used to indicate the region has changed
 CHANGED_TELEPORT        Parameter of changed event handler used to indicate teleport has completed
 CHANGED_REGION_START    Parameter of changed event handler used to indicate the region has been restarted
+CHANGED_MEDIA       Parameter of changed event handler used to indicate that media has changed on a face of the task
 
 TYPE_INTEGER            Indicates that the list entry is holding an integer
 TYPE_FLOAT                      Indicates that the list entry is holding an float
@@ -351,6 +353,8 @@ PRIM_BUMP_SHINY		Followed by an integer face, one of PRIM_SHINY_NONE, PRIM_SHINY
 PRIM_FULLBRIGHT         Followed by an integer face, and TRUE or FALSE
 PRIM_TEXGEN                     Followed by an integer face, and one of PRIM_TEXGEN_DEFAULT or PRIM_TEXGEN_PLANAR
 PRIM_GLOW                       Followed by an integer face, and a float from 0.0 to 1.0 specifying glow amount
+PRIM_NAME                       Sets/Shows the primitive name
+PRIM_TEXT                       Sets/Shows the primitive desc
 
 PRIM_TYPE_BOX           Followed by integer hole shape, vector cut, float hollow, vector twist,:vector top size, and vector top shear
 PRIM_TYPE_CYLINDER      Followed by integer hole shape, vector cut, float hollow, vector twist,:vector top size, and vector top shear
@@ -508,17 +512,59 @@ CLICK_ACTION_PAY        Used with llSetClickAction to set pay as the default act
 CLICK_ACTION_OPEN       Used with llSetClickAction to set open as the default action when object is clicked
 CLICK_ACTION_PLAY       Used with llSetClickAction to set play as the default action when object is clicked
 CLICK_ACTION_OPEN_MEDIA Used with llSetClickAction to set open-media as the default action when object is clicked
+CLICK_ACTION_ZOOM       Used with llSetClickAction to set zoom in as the default action when object is clicked
 
 TOUCH_INVALID_TEXCOORD  Value returned by llDetectedTouchUV() and llDetectedTouchST() when the touch position is not valid.
 TOUCH_INVALID_VECTOR    Value returned by llDetectedTouchPos(), llDetectedTouchNormal(), and llDetectedTouchBinormal() when the touch position is not valid.
 TOUCH_INVALID_FACE      Value returned by llDetectedTouchFace() when the touch position is not valid.
 
+PRIM_MEDIA_ALT_IMAGE_ENABLE            Used with ll{Get,Set}PrimMediaParams to enable the default alt image for media 
+PRIM_MEDIA_CONTROLS                    Used with ll{Get,Set}PrimMediaParams to determine the controls shown for media
+PRIM_MEDIA_CURRENT_URL                 Used with ll{Get,Set}PrimMediaParams to navigate/access the current URL
+PRIM_MEDIA_HOME_URL                    Used with ll{Get,Set}PrimMediaParams to access the home URL
+PRIM_MEDIA_AUTO_LOOP                   Used with ll{Get,Set}PrimMediaParams to determine if media should auto-loop (if applicable)
+PRIM_MEDIA_AUTO_PLAY                   Used with ll{Get,Set}PrimMediaParams to determine if media should start playing as soon as it is created
+PRIM_MEDIA_AUTO_SCALE                  Used with ll{Get,Set}PrimMediaParams to determine if media should scale to fit the face it is on 
+PRIM_MEDIA_AUTO_ZOOM                   Used with ll{Get,Set}PrimMediaParams to determine if the user would zoom in when viewing media
+PRIM_MEDIA_FIRST_CLICK_INTERACT        Used with ll{Get,Set}PrimMediaParams to determine whether the user interacts with media or not when she first clicks it (versus selection)
+PRIM_MEDIA_WIDTH_PIXELS                Used with ll{Get,Set}PrimMediaParams to access the media's width in pixels
+PRIM_MEDIA_HEIGHT_PIXELS               Used with ll{Get,Set}PrimMediaParams to access the media's height in pixels
+PRIM_MEDIA_WHITELIST_ENABLE            Used with ll{Get,Set}PrimMediaParams to determine if the domain whitelist is enabled
+PRIM_MEDIA_WHITELIST                   Used with ll{Get,Set}PrimMediaParams to access the media's list of allowable URL prefixes to navigate to
+PRIM_MEDIA_PERMS_INTERACT              Used with ll{Get,Set}PrimMediaParams to determine the permissions for who can interact with the media
+PRIM_MEDIA_PERMS_CONTROL               Used with ll{Get,Set}PrimMediaParams to determine the permissions for who has controls
+PRIM_MEDIA_PARAM_MAX                   The value of the largest media param
+
+PRIM_MEDIA_CONTROLS_STANDARD           Used with ll{Get,Set}PrimMediaParams, a PRIM_MEDIA_CONTROLS value meaning "standard controls"
+PRIM_MEDIA_CONTROLS_MINI               Used with ll{Get,Set}PrimMediaParams, a PRIM_MEDIA_CONTROLS value meaning "mini controls"              
+
+PRIM_MEDIA_PERM_NONE                   Used with ll{Get,Set}PrimMediaParams, a PRIM_MEDIA_PERMS_INTERACT or PRIM_MEDIA_PERMS_CONTROL bit, no permissions
+PRIM_MEDIA_PERM_OWNER                  Used with ll{Get,Set}PrimMediaParams, a PRIM_MEDIA_PERMS_INTERACT or PRIM_MEDIA_PERMS_CONTROL bit, owner permissions
+PRIM_MEDIA_PERM_GROUP                  Used with ll{Get,Set}PrimMediaParams, a PRIM_MEDIA_PERMS_INTERACT or PRIM_MEDIA_PERMS_CONTROL bit, group permissions
+PRIM_MEDIA_PERM_ANYONE                 Used with ll{Get,Set}PrimMediaParams, a PRIM_MEDIA_PERMS_INTERACT or PRIM_MEDIA_PERMS_CONTROL bit, anyone has permissions
+
+PRIM_MEDIA_MAX_URL_LENGTH              Used with ll{Get,Set}PrimMediaParams, the maximum length of PRIM_MEDIA_CURRENT_URL or PRIM_MEDIA_HOME_URL
+PRIM_MEDIA_MAX_WHITELIST_SIZE          Used with ll{Get,Set}PrimMediaParams, the maximum length, in bytes, of PRIM_MEDIA_WHITELIST
+PRIM_MEDIA_MAX_WHITELIST_COUNT         Used with ll{Get,Set}PrimMediaParams, the maximum number of items allowed in PRIM_MEDIA_WHITELIST
+PRIM_MEDIA_MAX_WIDTH_PIXELS            Used with ll{Get,Set}PrimMediaParams, the maximum width allowed in PRIM_MEDIA_WIDTH_PIXELS
+PRIM_MEDIA_MAX_HEIGHT_PIXELS           Used with ll{Get,Set}PrimMediaParams, the maximum width allowed in PRIM_MEDIA_HEIGHT_PIXELS
+
+STATUS_OK                              Result of function call was success
+STATUS_MALFORMED_PARAMS                Function was called with malformed params
+STATUS_TYPE_MISMATCH                   Argument(s) passed to function had a type mismatch
+STATUS_BOUNDS_ERROR                    Argument(s) passed to function had a bounds error 
+STATUS_NOT_FOUND                       Object or other item was not found
+STATUS_NOT_SUPPORTED                   Feature not supported
+STATUS_INTERNAL_ERROR                  An internal error occurred
+STATUS_WHITELIST_FAILED                URL failed to pass whitelist
+
 # string constants
 [word .1, .3, .5]
 NULL_KEY                        Indicates an empty key
 EOF                                     Indicates the last line of a notecard was read
 TEXTURE_BLANK                   UUID for the "Blank" texture
-TEXTURE_DEFAULT                 UUID for the "Default Media" texture
+TEXTURE_DEFAULT                 Alias for TEXTURE_PLYWOOD
+TEXTURE_MEDIA                   UUID for the "Default Media" texture
 TEXTURE_PLYWOOD                 UUID for the default "Plywood" texture
 TEXTURE_TRANSPARENT             UUID for the "White - Transparent" texture
 
@@ -539,6 +585,7 @@ SQRT2				1.4142135623730950488016887242097
 ZERO_VECTOR                     <0.0, 0.0, 0.0>
 ZERO_ROTATION           <0.0, 0.0, 0.0, 1.0>
 
+
 # flow control keywords
 [word 0, 0, .8]
 for                                     for loop:for (initializer; test; iteration):{:   statements:}
@@ -563,4 +610,4 @@ return				Leave current function or event handler
 [two_sided_delimiter_esc 0, .2, 0]
 " "                                     String literal
 
-#functions are supplied by the program now.
\ No newline at end of file
+#functions are supplied by the program now.