2 files changed, 18 insertions, 0 deletions

diff --git a/linden/indra/llcommon/llclickaction.h b/linden/indra/llcommon/llclickaction.h
index 8048724..209e2d6 100644
--- a/linden/indra/llcommon/llclickaction.h
+++ b/linden/indra/llcommon/llclickaction.h
@@ -42,5 +42,6 @@ const U8 CLICK_ACTION_PAY = 3;
 const U8 CLICK_ACTION_OPEN = 4;
 const U8 CLICK_ACTION_PLAY = 5;
 const U8 CLICK_ACTION_OPEN_MEDIA = 6;
+const U8 CLICK_ACTION_ZOOM = 7;
 
 #endif
diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h
index 7cd854f..fc5363f 100644
--- a/linden/indra/llcommon/lllslconstants.h
+++ b/linden/indra/llcommon/lllslconstants.h
@@ -48,6 +48,7 @@ const U32 AGENT_TYPING		= 0x0200;
 const U32 AGENT_CROUCHING       = 0x0400;
 const U32 AGENT_BUSY            = 0x0800;
 const U32 AGENT_ALWAYS_RUN      = 0x1000;
+const U32 AGENT_AUTOPILOT       = 0x2000;
 
 const S32 LSL_REMOTE_DATA_CHANNEL               = 1;
 const S32 LSL_REMOTE_DATA_REQUEST               = 2;
@@ -72,6 +73,9 @@ const S32 LSL_PRIM_TEXGEN		= 22;
 const S32 LSL_PRIM_POINT_LIGHT  = 23;
 const S32 LSL_PRIM_CAST_SHADOWS = 24;
 const S32 LSL_PRIM_GLOW         = 25;
+const S32 LSL_PRIM_TEXT                 = 26;
+const S32 LSL_PRIM_NAME                 = 27;
+const S32 LSL_PRIM_DESC                 = 28;
 
 const S32 LSL_PRIM_TYPE_BOX             = 0;
 const S32 LSL_PRIM_TYPE_CYLINDER= 1;
@@ -201,5 +205,18 @@ const U32	CHANGED_OWNER = 0x80;
 const U32       CHANGED_REGION = 0x100;
 const U32       CHANGED_TELEPORT = 0x200;
 const U32       CHANGED_REGION_START = 0x400;
+const U32   CHANGED_MEDIA = 0x800;
+
+// Possible error results
+const U32 LSL_STATUS_OK                 = 0;
+const U32 LSL_STATUS_MALFORMED_PARAMS   = 1000;
+const U32 LSL_STATUS_TYPE_MISMATCH      = 1001;
+const U32 LSL_STATUS_BOUNDS_ERROR       = 1002;
+const U32 LSL_STATUS_NOT_FOUND          = 1003;
+const U32 LSL_STATUS_NOT_SUPPORTED      = 1004;
+const U32 LSL_STATUS_INTERNAL_ERROR     = 1999;
+
+// Start per-function errors below, starting at 2000:
+const U32 LSL_STATUS_WHITELIST_FAILED   = 2001;
 
 #endif