Second Life viewer sources 1.16.0.5

2 files changed, 8 insertions, 1 deletions

diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index f4199df..7c9b3aa 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -4,7 +4,7 @@ L			[a-zA-Z_]
 H                       [a-fA-F0-9]
 E                       [Ee][+-]?{D}+
 FS                      (f|F)
-%e 9000
+%e 10000
 %n 4000
 %p 5000
 
@@ -434,6 +434,7 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "PRIM_TYPE_TORUS"               { count(); yylval.ival = LSL_PRIM_TYPE_TORUS; return(INTEGER_CONSTANT); }
 "PRIM_TYPE_TUBE"                { count(); yylval.ival = LSL_PRIM_TYPE_TUBE; return(INTEGER_CONSTANT); }
 "PRIM_TYPE_RING"                { count(); yylval.ival = LSL_PRIM_TYPE_RING; return(INTEGER_CONSTANT); }
+"PRIM_TYPE_SCULPT"              { count(); yylval.ival = LSL_PRIM_TYPE_SCULPT; return(INTEGER_CONSTANT); }
 
 "PRIM_HOLE_DEFAULT"             { count(); yylval.ival = LSL_PRIM_HOLE_DEFAULT; return(INTEGER_CONSTANT); }
 "PRIM_HOLE_CIRCLE"              { count(); yylval.ival = LSL_PRIM_HOLE_CIRCLE; return(INTEGER_CONSTANT); }
@@ -476,6 +477,11 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "PRIM_TEXGEN_DEFAULT"   { count(); yylval.ival = LSL_PRIM_TEXGEN_DEFAULT; return(INTEGER_CONSTANT); }
 "PRIM_TEXGEN_PLANAR"    { count(); yylval.ival = LSL_PRIM_TEXGEN_PLANAR; return(INTEGER_CONSTANT); }
 
+"PRIM_SCULPT_TYPE_SPHERE"       { count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_SPHERE; return(INTEGER_CONSTANT); }
+"PRIM_SCULPT_TYPE_TORUS"        { count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_TORUS; return(INTEGER_CONSTANT); }
+"PRIM_SCULPT_TYPE_PLANE"        { count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_PLANE; return(INTEGER_CONSTANT); }
+"PRIM_SCULPT_TYPE_CYLINDER"     { count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_CYLINDER; return(INTEGER_CONSTANT); }
+
 "MASK_BASE"                             { count(); yylval.ival = 0; return(INTEGER_CONSTANT); }
 "MASK_OWNER"                    { count(); yylval.ival = 1; return(INTEGER_CONSTANT); }
 "MASK_GROUP"                    { count(); yylval.ival = 2; return(INTEGER_CONSTANT); }
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index 7d38621..c44e1c0 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -424,6 +424,7 @@ void LLScriptLibrary::init()
 
         
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llStringTrim", "s", "si", "string llStringTrim(string src, integer trim_type)\nTrim leading and/or trailing spaces from a string.\nUses trim_type of STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL."));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llRegionSay", NULL, "is", "llRegionSay(integer channel, string msg)\nbroadcasts msg to entire region on channel (not 0.)"));
 
         // energy, sleep, dummy_func, name, return type, parameters, help text, gods-only