4 files changed, 18 insertions, 3 deletions

diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index 0beffe5..afd7e1a 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -227,6 +227,16 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "CHANGED_REGION"                { count(); yylval.ival = 0x100; return(INTEGER_CONSTANT); }     
 "CHANGED_TELEPORT"              { count(); yylval.ival = 0x200; return(INTEGER_CONSTANT); }     
 
+"OBJECT_UNKOWN_DETAIL"  { count(); yylval.ival = OBJECT_UNKOWN_DETAIL; return(INTEGER_CONSTANT); }
+"OBJECT_NAME"                   { count(); yylval.ival = OBJECT_NAME; return(INTEGER_CONSTANT); }
+"OBJECT_DESC"                   { count(); yylval.ival = OBJECT_DESC; return(INTEGER_CONSTANT); }
+"OBJECT_POS"                    { count(); yylval.ival = OBJECT_POS; return(INTEGER_CONSTANT); }
+"OBJECT_ROT"                    { count(); yylval.ival = OBJECT_ROT; return(INTEGER_CONSTANT); }
+"OBJECT_VELOCITY"               { count(); yylval.ival = OBJECT_VELOCITY; return(INTEGER_CONSTANT); }
+"OBJECT_OWNER"                  { count(); yylval.ival = OBJECT_OWNER; return(INTEGER_CONSTANT); }
+"OBJECT_GROUP"                  { count(); yylval.ival = OBJECT_GROUP; return(INTEGER_CONSTANT); }
+"OBJECT_CREATOR"                { count(); yylval.ival = OBJECT_CREATOR; return(INTEGER_CONSTANT); }
+
 "TYPE_INTEGER"                  { count(); yylval.ival = LST_INTEGER; return(INTEGER_CONSTANT); }       
 "TYPE_FLOAT"                    { count(); yylval.ival = LST_FLOATINGPOINT; return(INTEGER_CONSTANT); } 
 "TYPE_STRING"                   { count(); yylval.ival = LST_STRING; return(INTEGER_CONSTANT); }        
diff --git a/linden/indra/lscript/lscript_compile/indra.y b/linden/indra/lscript/lscript_compile/indra.y
index 49d0c38..56f40c9 100644
--- a/linden/indra/lscript/lscript_compile/indra.y
+++ b/linden/indra/lscript/lscript_compile/indra.y
@@ -53,7 +53,6 @@
 %token                                  QUATERNION
 %token                                  LIST
 
-%token                                  STATE_DEFAULT
 %token                                  STATE
 %token                                  EVENT
 %token                                  JUMP
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.cpp b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
index df679ed..075418d 100644
--- a/linden/indra/lscript/lscript_compile/lscript_tree.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
@@ -8957,8 +8957,12 @@ void LLScriptEventHandler::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
                 {
                         entrycount = 0;
                         mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, mScopeEntry, entrycount, NULL);
-                        fprintf(fp, "Function Args: %s\n", mScopeEntry->mFunctionArgs.mString);
-                        fprintf(fp, "Local List: %s\n", mScopeEntry->mLocals.mString);
+
+                        const char *function_args = mScopeEntry->mFunctionArgs.mString;
+                        fprintf(fp, "Function Args: %s\n", function_args?function_args:"");
+
+                        const char *local_list = mScopeEntry->mLocals.mString;
+                        fprintf(fp, "Local List: %s\n", local_list?local_list:"");
                 }
                 mStackSpace = (S32)count;
                 break;
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index c44e1c0..86fdd18 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -426,6 +426,8 @@ 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.)"));
 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetObjectDetails", "l", "kl", "list llGetObjectDetails(key id, list params)\nGets the object details specified in params for the object with key id.\nDetails are OBJECT_DETAILS_NAME, _DESCRIPTION, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR."));
+
         // 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.