fixed XP_ERROR rules

2 files changed, 36 insertions, 0 deletions

diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index 1c9f50202d..9cbddb60e2 100755
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -685,6 +685,23 @@ int yyerror(const char *fmt, ...);
 "PRIM_MEDIA_MAX_WIDTH_PIXELS"        { count(); yylval.ival = LLMediaEntry::MAX_WIDTH_PIXELS; return(INTEGER_CONSTANT); }
 "PRIM_MEDIA_MAX_HEIGHT_PIXELS"       { count(); yylval.ival = LLMediaEntry::MAX_HEIGHT_PIXELS; return(INTEGER_CONSTANT); }
 
+"XP_ERROR_NONE"                      { char* sval= "no error";                                yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_THROTTLED"                 { char* sval= "exceeded throttle";                       yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_EXPERIENCES_DISABLED"      { char* sval= "experiences are disabled";                yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_INVALID_PARAMETERS"        { char* sval= "invalid parameters";                      yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_NOT_PERMITTED"             { char* sval= "operation not permitted";                 yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_NO_EXPERIENCE"             { char* sval= "script not associated with an experience";yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_NOT_FOUND"                 { char* sval= "not found";                               yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_INVALID_EXPERIENCE"        { char* sval= "invalid experience";                      yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_EXPERIENCE_DISABLED"       { char* sval= "experience is disabled";                  yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_EXPERIENCE_SUSPENDED"      { char* sval= "experience is suspended";                 yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_UNKNOWN_ERROR"             { char* sval= "unknown error";                           yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_QUOTA_EXCEEDED"            { char* sval= "experience data quota exceeded";          yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_STORE_DISABLED"            { char* sval= "key-value store is disabled";             yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_STORAGE_EXCEPTION"         { char* sval= "key-value store communication failed";    yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_KEY_NOT_FOUND"             { char* sval= "key doesn't exist";                       yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+"XP_ERROR_RETRY_UPDATE"              { char* sval= "retry update";                            yylval.sval = new char[strlen(sval)]; strcpy(yylval.sval, sval); return(STRING_CONSTANT); }
+
 "STATUS_OK"                          { count(); yylval.ival = LSL_STATUS_OK; return(INTEGER_CONSTANT); }
 "STATUS_MALFORMED_PARAMS"            { count(); yylval.ival = LSL_STATUS_MALFORMED_PARAMS; return(INTEGER_CONSTANT); }
 "STATUS_TYPE_MISMATCH"               { count(); yylval.ival = LSL_STATUS_TYPE_MISMATCH; return(INTEGER_CONSTANT); }
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index a87310955f..5de79b4bf5 100755
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -52,6 +52,7 @@ remote_data     remote_data(integer event_type, key channel, key message_id, str
 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
 
+
 # integer constants
 [word .1, .1, .5]
 TRUE			Integer constant for Boolean operations
@@ -668,6 +669,24 @@ TEXTURE_TRANSPARENT		UUID for the "White - Transparent" texture
 URL_REQUEST_GRANTED		Used with http_request when a public URL is successfully granted
 URL_REQUEST_DENIED		Used with http_request when a public URL is not available
 
+XP_ERROR_NONE					No error was detected

+XP_ERROR_THROTTLED				The call failed due to too many recent calls.

+XP_ERROR_EXPERIENCES_DISABLED	The region currently has experiences disabled.

+XP_ERROR_INVALID_PARAMETERS		One of the string arguments was too big to fit in the key-value store.

+XP_ERROR_NOT_PERMITTED			This experience is not allowed to run on the current region.

+XP_ERROR_NO_EXPERIENCE			This script is not associated with an experience.

+XP_ERROR_NOT_FOUND				The sim was unable to verify the validity of the experience. Retrying after a short wait is advised.

+XP_ERROR_INVALID_EXPERIENCE		The script is associated with an experience that no longer exists.

+XP_ERROR_EXPERIENCE_DISABLED	The experience owner has temporarily disabled the experience.

+XP_ERROR_EXPERIENCE_SUSPENDED	The experience has been suspended by Linden Customer Support.

+XP_ERROR_QUOTA_EXCEEDED			An attempted write data to the key-value store failed due to the data quota being met.

+XP_ERROR_STORE_DISABLED			The key-value store is currently disabled on this region.

+XP_ERROR_STORAGE_EXCEPTION		Unable to communicate with the key-value store.

+XP_ERROR_KEY_NOT_FOUND			The requested key does not exist.

+XP_ERROR_RETRY_UPDATE			A checked update failed due to an out of date request.

+XP_ERROR_UNKNOWN_ERROR			Other unknown error.
+
+
 # float constants
 [word .3, .1, .5]
 PI					3.1415926535897932384626433832795