Second Life viewer sources 1.23.0-RC

43 files changed, 833 insertions, 69 deletions

diff --git a/linden/indra/lscript/CMakeLists.txt b/linden/indra/lscript/CMakeLists.txt
index c655aef..937e2ec 100644
--- a/linden/indra/lscript/CMakeLists.txt
+++ b/linden/indra/lscript/CMakeLists.txt
@@ -1,6 +1,9 @@
 # -*- cmake -*-
 
 set(lscript_HEADER_FILES
+    llscriptresource.h
+    llscriptresourceconsumer.h
+    llscriptresourcepool.h
     lscript_alloc.h
     lscript_byteconvert.h
     lscript_byteformat.h
diff --git a/linden/indra/lscript/llscriptresource.h b/linden/indra/lscript/llscriptresource.h
new file mode 100644
index 0000000..8509413
--- /dev/null
+++ b/linden/indra/lscript/llscriptresource.h
@@ -0,0 +1,75 @@
+/** 
+ * @file llscriptresource.h
+ * @brief LLScriptResource class definition
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSCRIPTRESOURCE_H
+#define LL_LLSCRIPTRESOURCE_H
+
+#include "stdtypes.h"
+
+// An LLScriptResource is a limited resource per ID.
+class LLScriptResource
+{
+public:
+        LLScriptResource();
+
+        // If amount resources are available will mark amount resouces 
+        // used and returns true
+        // Otherwise returns false and doesn't mark any resources used.
+        bool request(S32 amount = 1);
+
+        // Release amount resources from use if at least amount resources are used and return true
+        // If amount is more than currently used no resources are released and return false
+        bool release(S32 amount = 1);
+
+        // Returns how many resources are available
+        S32 getAvailable() const;
+
+        // Sets the total amount of available resources
+        // It is possible to set the amount to less than currently used
+        // Most likely to happen on parcel ownership change
+        void setTotal(S32 amount);
+
+        // Get the total amount of available resources
+        S32 getTotal() const;
+
+        // Get the number of resources used
+        S32 getUsed() const;
+
+        // true if more resources used than total available
+        bool isOverLimit() const;
+
+private:
+        S32 mTotal; // How many resources have been set aside
+        S32 mUsed; // How many resources are currently in use
+};
+
+#endif // LL_LLSCRIPTRESOURCE_H
diff --git a/linden/indra/lscript/llscriptresourceconsumer.h b/linden/indra/lscript/llscriptresourceconsumer.h
new file mode 100644
index 0000000..917b7be
--- /dev/null
+++ b/linden/indra/lscript/llscriptresourceconsumer.h
@@ -0,0 +1,67 @@
+/** 
+ * @file llscriptresourceconsumer.h
+ * @brief An interface for a script resource consumer.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSCRIPTRESOURCECONSUMER_H
+#define LL_LLSCRIPTRESOURCECONSUMER_H
+
+#include "linden_common.h"
+
+class LLScriptResourcePool;
+
+// Entities that use limited script resources 
+// should implement this interface
+
+class LLScriptResourceConsumer
+{
+public: 
+        LLScriptResourceConsumer();
+
+        virtual ~LLScriptResourceConsumer() { }
+
+        // Get the number of public urls used by this consumer.
+        virtual S32 getUsedPublicURLs() const = 0;
+
+        // Get the resource pool this consumer is currently using.
+        LLScriptResourcePool& getScriptResourcePool();
+        const LLScriptResourcePool& getScriptResourcePool() const;
+
+        bool switchScriptResourcePools(LLScriptResourcePool& new_pool);
+        bool canUseScriptResourcePool(const LLScriptResourcePool& resource_pool);
+        bool isInPool(const LLScriptResourcePool& resource_pool);
+
+protected:
+        virtual void setScriptResourcePool(LLScriptResourcePool& pool);
+
+        LLScriptResourcePool* mScriptResourcePool;
+};
+
+#endif // LL_LLSCRIPTRESOURCECONSUMER_H
diff --git a/linden/indra/lscript/llscriptresourcepool.h b/linden/indra/lscript/llscriptresourcepool.h
new file mode 100644
index 0000000..250341c
--- /dev/null
+++ b/linden/indra/lscript/llscriptresourcepool.h
@@ -0,0 +1,57 @@
+/** 
+ * @file llscriptresourcepool.h
+ * @brief A collection of LLScriptResources
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSCRIPTRESOURCEPOOL_H
+#define LL_LLSCRIPTRESOURCEPOOL_H
+
+#include "llscriptresource.h"
+
+// This is just a holder for LLSimResources
+class LLScriptResourcePool
+{
+public: 
+        LLScriptResourcePool();
+        // ~LLSimResourceMgr();
+
+        LLScriptResource& getPublicURLResource();
+        const LLScriptResource& getPublicURLResource() const;
+
+        // An empty resource pool.
+        static LLScriptResourcePool null;
+
+private:
+        LLScriptResource mLSLPublicURLs;
+};
+
+
+
+#endif
diff --git a/linden/indra/lscript/lscript_alloc.h b/linden/indra/lscript/lscript_alloc.h
index a58d9eb..fe83c5c 100644
--- a/linden/indra/lscript/lscript_alloc.h
+++ b/linden/indra/lscript/lscript_alloc.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_byteconvert.h b/linden/indra/lscript/lscript_byteconvert.h
index 573a6ce..aa8c7ff 100644
--- a/linden/indra/lscript/lscript_byteconvert.h
+++ b/linden/indra/lscript/lscript_byteconvert.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_byteformat.h b/linden/indra/lscript/lscript_byteformat.h
index 418c248..ba2c46b 100644
--- a/linden/indra/lscript/lscript_byteformat.h
+++ b/linden/indra/lscript/lscript_byteformat.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -359,6 +360,7 @@ typedef enum e_lscript_state_event_type
         LSTT_OBJECT_REZ,
         LSTT_REMOTE_DATA,
         LSTT_HTTP_RESPONSE,
+        LSTT_HTTP_REQUEST,
         LSTT_EOF,
         
         LSTT_STATE_BEGIN = LSTT_STATE_ENTRY,
@@ -400,7 +402,8 @@ const U64 LSCRIPTStateBitField[LSTT_EOF] =
         0x0000000020000000,             //  LSTT_MOVING_END
         0x0000000040000000,             //  LSTT_OBJECT_REZ
         0x0000000080000000,             //  LSTT_REMOTE_DATA
-        0x0000000100000000LL     // LSTT_HTTP_RESPOSE
+        0x0000000100000000LL,   // LSTT_HTTP_RESPOSE
+        0x0000000200000000LL    // LSTT_HTTP_REQUEST
 };
 
 inline S32 get_event_handler_jump_position(U64 bit_field, LSCRIPTStateEventType type)
@@ -550,5 +553,10 @@ const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] =
         (0x1 << 11),//  SCRIPT_PERMISSION_CONTROL_CAMERA
 };
 
+// http_request string constants
+extern const char* URL_REQUEST_GRANTED;
+extern const char* URL_REQUEST_DENIED;
+extern const U64 LSL_HTTP_REQUEST_TIMEOUT;
+
 #endif
 
diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index 3e62195..ac52432 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -36,7 +36,8 @@ FS			(f|F)
 #include "llclickaction.h"
 
 void count();
-void comment();
+void line_comment();
+void block_comment();
 void parse_string();
 
 #define YYLMAX 16384
@@ -60,7 +61,8 @@ extern "C" { int yyerror(const char *fmt, ...); }
 %}
 
 %%
-"//"                                    { gInternalLine++; gInternalColumn = 0; comment(); }
+"//"                                    { gInternalLine++; gInternalColumn = 0; line_comment(); }
+"/*"                                    { block_comment(); }
 
 "integer"                       { count(); return(INTEGER); }
 "float"                         { count(); return(FLOAT_TYPE); }
@@ -116,6 +118,7 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "object_rez"                    { count(); return(OBJECT_REZ); }
 "remote_data"                   { count(); return(REMOTE_DATA); }
 "http_response"                 { count(); return(HTTP_RESPONSE); }
+"http_request"                  { count(); return(HTTP_REQUEST); }
 "."                                             { count(); return(PERIOD); }
 
 
@@ -219,16 +222,17 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "INVENTORY_ALL"                                         { count(); yylval.ival = LLAssetType::AT_NONE; return(INTEGER_CONSTANT); }
 "INVENTORY_NONE"                                        { count(); yylval.ival = LLAssetType::AT_NONE; return(INTEGER_CONSTANT); }
 
-"CHANGED_INVENTORY"             { count(); yylval.ival = 0x1; return(INTEGER_CONSTANT); }       
-"CHANGED_COLOR"                 { count(); yylval.ival = 0x2; return(INTEGER_CONSTANT); }       
-"CHANGED_SHAPE"                 { count(); yylval.ival = 0x4; return(INTEGER_CONSTANT); }       
-"CHANGED_SCALE"                 { count(); yylval.ival = 0x8; return(INTEGER_CONSTANT); }       
-"CHANGED_TEXTURE"               { count(); yylval.ival = 0x10; return(INTEGER_CONSTANT); }      
-"CHANGED_LINK"                  { count(); yylval.ival = 0x20; return(INTEGER_CONSTANT); }      
-"CHANGED_ALLOWED_DROP"  { count(); yylval.ival = 0x40; return(INTEGER_CONSTANT); }      
-"CHANGED_OWNER"                 { count(); yylval.ival = 0x80; return(INTEGER_CONSTANT); }      
-"CHANGED_REGION"                { count(); yylval.ival = 0x100; return(INTEGER_CONSTANT); }     
-"CHANGED_TELEPORT"              { count(); yylval.ival = 0x200; return(INTEGER_CONSTANT); }     
+"CHANGED_INVENTORY"             { count(); yylval.ival = CHANGED_INVENTORY; return(INTEGER_CONSTANT); } 
+"CHANGED_COLOR"                 { count(); yylval.ival = CHANGED_COLOR; return(INTEGER_CONSTANT); }     
+"CHANGED_SHAPE"                 { count(); yylval.ival = CHANGED_SHAPE; return(INTEGER_CONSTANT); }     
+"CHANGED_SCALE"                 { count(); yylval.ival = CHANGED_SCALE; return(INTEGER_CONSTANT); }     
+"CHANGED_TEXTURE"               { count(); yylval.ival = CHANGED_TEXTURE; return(INTEGER_CONSTANT); }   
+"CHANGED_LINK"                  { count(); yylval.ival = CHANGED_LINK; return(INTEGER_CONSTANT); }      
+"CHANGED_ALLOWED_DROP"  { count(); yylval.ival = CHANGED_ALLOWED_DROP; return(INTEGER_CONSTANT); }      
+"CHANGED_OWNER"                 { count(); yylval.ival = CHANGED_OWNER; return(INTEGER_CONSTANT); }     
+"CHANGED_REGION"                { count(); yylval.ival = CHANGED_REGION; return(INTEGER_CONSTANT); }    
+"CHANGED_TELEPORT"              { count(); yylval.ival = CHANGED_TELEPORT; return(INTEGER_CONSTANT); }  
+"CHANGED_REGION_START"          { count(); yylval.ival = CHANGED_REGION_START; return(INTEGER_CONSTANT); }      
 
 "OBJECT_UNKNOWN_DETAIL" { count(); yylval.ival = OBJECT_UNKNOWN_DETAIL; return(INTEGER_CONSTANT); }
 "OBJECT_NAME"                   { count(); yylval.ival = OBJECT_NAME; return(INTEGER_CONSTANT); }
@@ -250,6 +254,8 @@ extern "C" { int yyerror(const char *fmt, ...); }
 
 "NULL_KEY"                              { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "00000000-0000-0000-0000-000000000000"); return(STRING_CONSTANT); }
 "EOF"                                   { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "\n\n\n"); return(STRING_CONSTANT); }
+"URL_REQUEST_GRANTED"   { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, URL_REQUEST_GRANTED); return(STRING_CONSTANT); }
+"URL_REQUEST_DENIED"    { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, URL_REQUEST_DENIED); return(STRING_CONSTANT); }
 
 "PI"                                    { count(); yylval.fval = F_PI; return(FP_CONSTANT); }
 "TWO_PI"                                { count(); yylval.fval = F_TWO_PI; return(FP_CONSTANT); }
@@ -790,7 +796,7 @@ S32 yywrap()
         return(1);
 }
 
-void comment()
+void line_comment()
 {
         char c;
 
@@ -798,6 +804,25 @@ void comment()
                 ;
 }
 
+void block_comment()
+{
+        char c1 = 0;
+        char c2 = yyinput();
+        while (c2 != 0 && c2 != EOF && !(c1 == '*' && c2 == '/')) {
+                if (c2 == '\n')
+                {
+                        gInternalLine++;
+                        gInternalColumn = 0;
+                }
+                else if (c2 == '\t')
+                        gInternalColumn += 4 - (gInternalColumn % 8);
+                else
+                        gInternalColumn++;
+                c1 = c2;
+                c2 = yyinput();
+        }
+}
+
 void count()
 {
         S32 i;
diff --git a/linden/indra/lscript/lscript_compile/indra.y b/linden/indra/lscript/lscript_compile/indra.y
index fdc240c..e4b10ff 100644
--- a/linden/indra/lscript/lscript_compile/indra.y
+++ b/linden/indra/lscript/lscript_compile/indra.y
@@ -92,6 +92,7 @@
 %token                                  LINK_MESSAGE
 %token                                  REMOTE_DATA
 %token                                  HTTP_RESPONSE
+%token                                  HTTP_REQUEST
 
 %token <sval>                   IDENTIFIER
 %token <sval>                   STATE_DEFAULT
@@ -195,6 +196,7 @@
 %type <event>                   object_rez
 %type <event>                   remote_data
 %type <event>                   http_response
+%type <event>                   http_request
 %type <event>                   link_message
 %type <event>                   timer
 %type <event>                   chat
@@ -848,6 +850,11 @@ event
                 $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
                 gAllocationManager->addAllocation($$);
         }
+        | http_request compound_statement                                                                                                               
+        {  
+                $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
+                gAllocationManager->addAllocation($$);
+        }
         ;
         
 state_entry
@@ -1216,6 +1223,20 @@ http_response
         }
         ;
 
+http_request
+        : HTTP_REQUEST '(' LLKEY IDENTIFIER ','  STRING IDENTIFIER ',' STRING IDENTIFIER ')'                                                                                                                    
+        {  
+                LLScriptIdentifier      *id1 = new LLScriptIdentifier(gLine, gColumn, $4);      
+                gAllocationManager->addAllocation(id1);
+                LLScriptIdentifier      *id2 = new LLScriptIdentifier(gLine, gColumn, $7);      
+                gAllocationManager->addAllocation(id2);
+                LLScriptIdentifier      *id3 = new LLScriptIdentifier(gLine, gColumn, $10);     
+                gAllocationManager->addAllocation(id3);
+                $$ = new LLScriptHTTPRequestEvent(gLine, gColumn, id1, id2, id3);
+                gAllocationManager->addAllocation($$);
+        }
+        ;
+        
 compound_statement
         : '{' '}'                                                                                                                                               
         {  
diff --git a/linden/indra/lscript/lscript_compile/lscript_alloc.cpp b/linden/indra/lscript/lscript_compile/lscript_alloc.cpp
index f522e18..76713de 100644
--- a/linden/indra/lscript/lscript_compile/lscript_alloc.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_alloc.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp b/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
index f6e5127..9cd7d48 100644
--- a/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_bytecode.h b/linden/indra/lscript/lscript_compile/lscript_bytecode.h
index c9f8633..5e2789d 100644
--- a/linden/indra/lscript/lscript_compile/lscript_bytecode.h
+++ b/linden/indra/lscript/lscript_compile/lscript_bytecode.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_error.cpp b/linden/indra/lscript/lscript_compile/lscript_error.cpp
index 5bdf2a2..c1a765b 100644
--- a/linden/indra/lscript/lscript_compile/lscript_error.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_error.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_error.h b/linden/indra/lscript/lscript_compile/lscript_error.h
index 2f8f8bc..95f48a4 100644
--- a/linden/indra/lscript/lscript_compile/lscript_error.h
+++ b/linden/indra/lscript/lscript_compile/lscript_error.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_heap.cpp b/linden/indra/lscript/lscript_compile/lscript_heap.cpp
index 5dccce9..b4d2764 100644
--- a/linden/indra/lscript/lscript_compile/lscript_heap.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_heap.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_heap.h b/linden/indra/lscript/lscript_compile/lscript_heap.h
index ced4609..b1a4b5c 100644
--- a/linden/indra/lscript/lscript_compile/lscript_heap.h
+++ b/linden/indra/lscript/lscript_compile/lscript_heap.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_resource.cpp b/linden/indra/lscript/lscript_compile/lscript_resource.cpp
index eb23665..c5eff1c 100644
--- a/linden/indra/lscript/lscript_compile/lscript_resource.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_resource.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_resource.h b/linden/indra/lscript/lscript_compile/lscript_resource.h
index f69e605..ede8b03 100644
--- a/linden/indra/lscript/lscript_compile/lscript_resource.h
+++ b/linden/indra/lscript/lscript_compile/lscript_resource.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_scope.cpp b/linden/indra/lscript/lscript_compile/lscript_scope.cpp
index 95a8eae..e6a7940 100644
--- a/linden/indra/lscript/lscript_compile/lscript_scope.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_scope.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_scope.h b/linden/indra/lscript/lscript_compile/lscript_scope.h
index 31125bc..ec36d37 100644
--- a/linden/indra/lscript/lscript_compile/lscript_scope.h
+++ b/linden/indra/lscript/lscript_compile/lscript_scope.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.cpp b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
index 2a41d91..e291d4c 100644
--- a/linden/indra/lscript/lscript_compile/lscript_tree.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -630,7 +631,9 @@ static void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetTy
                 switch(targetType)
                 {
                 case LST_INTEGER:
-                        fprintf(fp, "conv.i4\n");
+                        //fprintf(fp, "call int32 [LslLibrary]LindenLab.SecondLife.LslRunTime::ToInteger(float32)\n");
+                        fprintf(fp, "conv.i4\n"); // TODO replace this line with the above
+                        // we the entire grid is > 1.25.1
                         break;
                 case LST_STRING:
                         fprintf(fp, "call string [LslLibrary]LindenLab.SecondLife.LslRunTime::ToString(float32)\n");
@@ -3288,6 +3291,110 @@ S32 LLScriptHTTPResponseEvent::getSize()
         return 16;
 }
 
+void LLScriptHTTPRequestEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
+{
+        if (gErrorToText.getErrors())
+        {
+                return;
+        }
+        switch(pass)
+        {
+        case LSCP_PRETTY_PRINT:
+        case LSCP_EMIT_ASSEMBLY:
+                fdotabs(fp, tabs, tabsize);
+                fprintf(fp, "http_request( key ");
+                mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+                fprintf(fp, ", string ");
+                mMethod->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+                fprintf(fp, ", string ");
+                mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+                fprintf(fp, " )\n");
+                break;
+                
+        case LSCP_SCOPE_PASS1:
+                checkForDuplicateHandler(fp, this, scope, "http_request");
+                if (scope->checkEntry(mRequestId->mName))
+                {
+                        gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
+                }
+                else
+                {
+                        mRequestId->mScopeEntry = scope->addEntry(mRequestId->mName, LIT_VARIABLE, LST_KEY);
+                }
+
+                if (scope->checkEntry(mMethod->mName))
+                {
+                        gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
+                }
+                else
+                {
+                        mMethod->mScopeEntry = scope->addEntry(mMethod->mName, LIT_VARIABLE, LST_STRING);
+                }
+                
+                if (scope->checkEntry(mBody->mName))
+                {
+                        gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
+                }
+                else
+                {
+                        mBody->mScopeEntry = scope->addEntry(mBody->mName, LIT_VARIABLE, LST_STRING);
+                }
+                break;
+                
+        case LSCP_RESOURCE:
+                {
+                        // we're just tryng to determine how much space the variable needs
+                        if (mRequestId->mScopeEntry)
+                        {
+                                mRequestId->mScopeEntry->mOffset = (S32)count;
+                                mRequestId->mScopeEntry->mSize = 4;
+                                count += mRequestId->mScopeEntry->mSize;
+
+                                mMethod->mScopeEntry->mOffset = (S32)count;
+                                mMethod->mScopeEntry->mSize = 4;
+                                count += mMethod->mScopeEntry->mSize;
+
+                                mBody->mScopeEntry->mOffset = (S32)count;
+                                mBody->mScopeEntry->mSize = 4;
+                                count += mBody->mScopeEntry->mSize;
+                        }
+                }
+                break;
+                
+        case LSCP_EMIT_BYTE_CODE:
+                {
+#ifdef LSL_INCLUDE_DEBUG_INFO
+                        char name[] = "http_request";
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mRequestId->mName, strlen(mRequestId->mName) + 1);              /*Flawfinder: ignore*/
+                        chunk->addBytes(mMethod->mName, strlen(mMethod->mName) + 1);            /*Flawfinder: ignore*/
+                        chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1);                /*Flawfinder: ignore*/
+#endif
+                }
+                break;
+        case LSCP_EMIT_CIL_ASSEMBLY:
+                fdotabs(fp, tabs, tabsize);
+                fprintf(fp, "http_request( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+                mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+                fprintf(fp, ", string ");
+                mMethod->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+                fprintf(fp, ", string ");
+                mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+                fprintf(fp, " )\n");
+                break;
+        default:
+                mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+                mMethod->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+                mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+                break;
+        }
+}
+
+S32 LLScriptHTTPRequestEvent::getSize()
+{
+        // key + string + string = 12
+        return 12;
+}
 
 void LLScriptMoneyEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
@@ -9655,6 +9762,11 @@ void LLScriptEventHandler::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                         mScopeEntry->mFunctionArgs.addType(LST_LIST);
                         mScopeEntry->mFunctionArgs.addType(LST_STRING);
                         break;
+                case LSTT_HTTP_REQUEST:
+                        mScopeEntry->mFunctionArgs.addType(LST_KEY);
+                        mScopeEntry->mFunctionArgs.addType(LST_STRING);
+                        mScopeEntry->mFunctionArgs.addType(LST_STRING);
+                        break;
 
                 default:
                         break;
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.h b/linden/indra/lscript/lscript_compile/lscript_tree.h
index 0e110f5..12c1690 100644
--- a/linden/indra/lscript/lscript_compile/lscript_tree.h
+++ b/linden/indra/lscript/lscript_compile/lscript_tree.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -758,12 +759,12 @@ class LLScriptHTTPResponseEvent : public LLScriptEvent
 {
 public:
         LLScriptHTTPResponseEvent(S32 line, S32 col,
-                LLScriptIdentifier *reqeust_id,
+                LLScriptIdentifier *request_id,
                 LLScriptIdentifier *status,
                 LLScriptIdentifier *metadata,
                 LLScriptIdentifier *body)
                 : LLScriptEvent(line, col, LSTT_HTTP_RESPONSE),
-                 mRequestId(reqeust_id), mStatus(status), mMetadata(metadata), mBody(body)
+                 mRequestId(request_id), mStatus(status), mMetadata(metadata), mBody(body)
         {
         }
 
@@ -782,6 +783,32 @@ public:
         LLScriptIdentifier      *mBody;
 };
 
+class LLScriptHTTPRequestEvent : public LLScriptEvent
+{
+public:
+        LLScriptHTTPRequestEvent(S32 line, S32 col,
+                LLScriptIdentifier *request_id,
+                LLScriptIdentifier *method,
+                LLScriptIdentifier *body)
+                : LLScriptEvent(line, col, LSTT_HTTP_REQUEST),
+                 mRequestId(request_id), mMethod(method), mBody(body)
+        {
+        }
+
+        void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass,
+                LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope,
+                LSCRIPTType &type, LSCRIPTType basetype, U64 &count,
+                LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap,
+                S32 stacksize, LLScriptScopeEntry *entry,
+                S32 entrycount, LLScriptLibData **ldata);
+                
+        S32 getSize();
+
+        LLScriptIdentifier      *mRequestId;
+        LLScriptIdentifier      *mMethod;
+        LLScriptIdentifier      *mBody;
+};
+
 class LLScriptRezEvent : public LLScriptEvent
 {
 public:
diff --git a/linden/indra/lscript/lscript_compile/lscript_typecheck.cpp b/linden/indra/lscript/lscript_compile/lscript_typecheck.cpp
index ed01cdd..6a409b8 100644
--- a/linden/indra/lscript/lscript_compile/lscript_typecheck.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_typecheck.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_compile/lscript_typecheck.h b/linden/indra/lscript/lscript_compile/lscript_typecheck.h
index 7e3a35d..cebe3ce 100644
--- a/linden/indra/lscript/lscript_compile/lscript_typecheck.h
+++ b/linden/indra/lscript/lscript_compile/lscript_typecheck.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_execute.h b/linden/indra/lscript/lscript_execute.h
index cfea328..9a631c4 100644
--- a/linden/indra/lscript/lscript_execute.h
+++ b/linden/indra/lscript/lscript_execute.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -402,6 +403,8 @@ public:
         virtual U32 getBytecodeSize() const = 0;
         virtual bool isMono() const = 0;
         virtual void error() {;} // Processing that must be performed when error flag is set and so run is not called.
+
+        virtual U32 getUsedMemory() = 0;
         
         // Run current event handler for a maximum of time_slice seconds.
         // Updates current handler and current events registers.
@@ -431,6 +434,13 @@ public:
                                                   F32 quanta,
                                                   U32& events_processed, LLTimer& timer);
 
+        // NOTE: babbage: this must be used on occasions where another script may already be executing. Only 2 levels of nesting are allowed.
+        // Provided to support bizarre detach behaviour only. Do not use.
+        virtual F32 runNested(BOOL b_print, const LLUUID &id,
+                                                  const char **errorstr, 
+                                                  F32 quanta,
+                                                  U32& events_processed, LLTimer& timer);
+
         // Run smallest possible amount of code: an instruction for LSL2, a segment
         // between save tests for Mono
         void runInstructions(BOOL b_print, const LLUUID &id,
@@ -449,9 +459,16 @@ public:
         // Called when the script is scheduled to be stopped from newsim/LLScriptData
         virtual void stopRunning() = 0;
         
+        // A timer is regularly checked to see if script takes too long, but we
+        // don't do it every opcode due to performance hits.
+        static void             setTimerCheckSkip( S32 value )                  { sTimerCheckSkip = value;              }
+        static S32              getTimerCheckSkip()                                             { return sTimerCheckSkip;               }
+
 private:
 
         BOOL mReset;
+
+        static  S32             sTimerCheckSkip;                // Number of times to skip the timer check for performance reasons
 };
 
 class LLScriptExecuteLSL2 : public LLScriptExecute
@@ -493,7 +510,7 @@ public:
         virtual const U8* getBytecode() const {return mBytecode;}
         virtual U32 getBytecodeSize() const {return mBytecodeSize;}
         virtual bool isMono() const {return false;}
-
+        virtual U32 getUsedMemory();
         // Run current event handler for a maximum of time_slice seconds.
         // Updates current handler and current events registers.
         virtual void resumeEventHandler(BOOL b_print, const LLUUID &id, F32 time_slice);
diff --git a/linden/indra/lscript/lscript_execute/CMakeLists.txt b/linden/indra/lscript/lscript_execute/CMakeLists.txt
index f30915b..3a16ffd 100644
--- a/linden/indra/lscript/lscript_execute/CMakeLists.txt
+++ b/linden/indra/lscript/lscript_execute/CMakeLists.txt
@@ -12,6 +12,9 @@ include_directories(
     )
 
 set(lscript_execute_SOURCE_FILES
+    llscriptresource.cpp
+    llscriptresourceconsumer.cpp
+    llscriptresourcepool.cpp
     lscript_execute.cpp
     lscript_heapruntime.cpp
     lscript_readlso.cpp
@@ -20,6 +23,9 @@ set(lscript_execute_SOURCE_FILES
 set(lscript_execute_HEADER_FILES
     CMakeLists.txt
 
+    ../llscriptresource.h
+    ../llscriptresourceconsumer.h
+    ../llscriptresourcepool.h
     ../lscript_execute.h
     ../lscript_rt_interface.h
     lscript_heapruntime.h
diff --git a/linden/indra/lscript/lscript_execute/llscriptresource.cpp b/linden/indra/lscript/lscript_execute/llscriptresource.cpp
new file mode 100644
index 0000000..6c4776c
--- /dev/null
+++ b/linden/indra/lscript/lscript_execute/llscriptresource.cpp
@@ -0,0 +1,97 @@
+/** 
+ * @file llscriptresource.cpp
+ * @brief LLScriptResource class implementation for managing limited resources
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llscriptresource.h"
+#include "llerror.h"
+
+LLScriptResource::LLScriptResource()
+: mTotal(0),
+  mUsed(0)
+{
+}
+
+bool LLScriptResource::request(S32 amount /* = 1 */)
+{
+        if (mUsed + amount <= mTotal)
+        {
+                mUsed += amount;
+                return true;
+        }
+
+        return false;
+}
+
+bool LLScriptResource::release(S32 amount /* = 1 */)
+{
+        if (mUsed >= amount)
+        {
+                mUsed -= amount;
+                return true;
+        }
+
+        return false;
+}
+
+S32 LLScriptResource::getAvailable() const
+{
+        if (mUsed > mTotal)
+        {
+                // It is possible after a parcel ownership change for more than total to be used
+                // In this case the user of this class just wants to know 
+                // whether or not they can use a resource
+                return 0;
+        }
+        return (mTotal - mUsed);
+}
+
+void LLScriptResource::setTotal(S32 amount)
+{
+        // This may cause this resource to be over spent
+        // such that more are in use than total allowed
+        // Until those resources are released getAvailable will return 0.
+        mTotal = amount;
+}
+
+S32 LLScriptResource::getTotal() const
+{
+        return mTotal;
+}
+
+S32 LLScriptResource::getUsed() const
+{
+        return mUsed;
+}
+
+bool LLScriptResource::isOverLimit() const
+{
+        return (mUsed > mTotal);
+}
diff --git a/linden/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp b/linden/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp
new file mode 100644
index 0000000..5bade41
--- /dev/null
+++ b/linden/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp
@@ -0,0 +1,112 @@
+/** 
+ * @file llscriptresourceconsumer.cpp
+ * @brief An interface for a script resource consumer.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llscriptresourceconsumer.h"
+
+#include "llscriptresourcepool.h"
+
+LLScriptResourceConsumer::LLScriptResourceConsumer()
+        : mScriptResourcePool(&LLScriptResourcePool::null)
+{ }
+
+// Get the resource pool this consumer is currently using.
+// virtual 
+LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool()
+{
+        return *mScriptResourcePool;
+}
+
+// Get the resource pool this consumer is currently using.
+// virtual 
+const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const
+{
+        return *mScriptResourcePool;
+}
+
+// virtual
+void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& new_pool)
+{
+        mScriptResourcePool = &new_pool;
+}
+
+bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool)
+{
+        if (&new_pool == &LLScriptResourcePool::null)
+        {
+                llwarns << "New pool is null" << llendl;
+        }
+
+        if (isInPool(new_pool))
+        {
+                return true;
+        }
+
+        if (!canUseScriptResourcePool(new_pool))
+        {
+                return false;
+        }
+
+        S32 used_urls = getUsedPublicURLs();
+        
+        getScriptResourcePool().getPublicURLResource().release( used_urls );
+        setScriptResourcePool(new_pool);
+        getScriptResourcePool().getPublicURLResource().request( used_urls );
+        
+        return true;
+}
+
+bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool)
+{
+        if (isInPool(resource_pool))
+        {
+                return true;
+        }
+
+        if (resource_pool.getPublicURLResource().getAvailable() < getUsedPublicURLs())
+        {
+                return false;
+        }
+        
+        return true;
+}
+
+bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool)
+{
+        const LLScriptResourcePool& current_pool = getScriptResourcePool();
+        if ( &resource_pool == &current_pool )
+        {
+                // This consumer is already in this pool
+                return true;
+        }
+        return false;
+}
+
diff --git a/linden/indra/lscript/lscript_execute/llscriptresourcepool.cpp b/linden/indra/lscript/lscript_execute/llscriptresourcepool.cpp
new file mode 100644
index 0000000..3052152
--- /dev/null
+++ b/linden/indra/lscript/lscript_execute/llscriptresourcepool.cpp
@@ -0,0 +1,50 @@
+/** 
+ * @file llscriptresourcepool.cpp
+ * @brief Collection of limited script resources
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llscriptresourcepool.h"
+
+LLScriptResourcePool LLScriptResourcePool::null;
+
+LLScriptResourcePool::LLScriptResourcePool() 
+{ 
+
+}
+
+LLScriptResource& LLScriptResourcePool::getPublicURLResource()
+{
+        return mLSLPublicURLs;
+}
+
+const LLScriptResource& LLScriptResourcePool::getPublicURLResource() const
+{
+        return mLSLPublicURLs;
+}
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.cpp b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
index d178a16..b2b54cd 100644
--- a/linden/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -41,6 +42,10 @@
 #include "lscript_heapruntime.h"
 #include "lscript_alloc.h"
 
+// Static
+const   S32     DEFAULT_SCRIPT_TIMER_CHECK_SKIP = 4;
+S32             LLScriptExecute::sTimerCheckSkip = DEFAULT_SCRIPT_TIMER_CHECK_SKIP;
+
 void (*binary_operations[LST_EOF][LST_EOF])(U8 *buffer, LSCRIPTOpCodesEnum opcode);
 void (*unary_operations[LST_EOF])(U8 *buffer, LSCRIPTOpCodesEnum opcode);
 
@@ -63,6 +68,12 @@ const char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] =		/*Flawfinder: ignore*/
 void LLScriptExecuteLSL2::startRunning() {}
 void LLScriptExecuteLSL2::stopRunning() {}
 
+const char* URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
+const char* URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
+
+// HTTP Requests to LSL scripts will time out after 25 seconds.
+const U64 LSL_HTTP_REQUEST_TIMEOUT = 25 * USEC_PER_SEC; 
+
 LLScriptExecuteLSL2::LLScriptExecuteLSL2(LLFILE *fp)
 {
         U8  sizearray[4];
@@ -744,6 +755,11 @@ S32 LLScriptExecuteLSL2::getMajorVersion() const
         return major_version;
 }
 
+U32 LLScriptExecuteLSL2::getUsedMemory()
+{
+        return getBytecodeSize();
+}
+
 LLScriptExecute::LLScriptExecute() :
         mReset(FALSE)
 {
@@ -891,14 +907,13 @@ void LLScriptExecute::runInstructions(BOOL b_print, const LLUUID &id,
                         b_done = TRUE;
                 }
 
-                while (!b_done)
+                if (!b_done)
                 {
                         // Call handler for next queued event.
                         if(getEventCount() > 0)
                         {
                                 ++events_processed;
                                 callNextQueuedEventHandler(event_register, id, quanta);
-                                b_done = TRUE;
                         }
                         else
                         {
@@ -910,8 +925,8 @@ void LLScriptExecute::runInstructions(BOOL b_print, const LLUUID &id,
                                         ++events_processed;
                                         callEventHandler(event, id, quanta);
                                 }
-                                b_done = TRUE;
                         }
+                        b_done = TRUE;
                 }
         }
 }
@@ -919,7 +934,7 @@ void LLScriptExecute::runInstructions(BOOL b_print, const LLUUID &id,
 // Run for a single timeslice, or until a yield or state transition is due
 F32 LLScriptExecute::runQuanta(BOOL b_print, const LLUUID &id, const char **errorstr, F32 quanta, U32& events_processed, LLTimer& timer)
 {
-        U32 timer_checks = 0;
+        S32 timer_checks = 0;
         F32 inloop = 0;
 
         // Loop while not finished, yield not due and time remaining
@@ -931,12 +946,11 @@ F32 LLScriptExecute::runQuanta(BOOL b_print, const LLUUID &id, const char **erro
                 runInstructions(b_print, id, errorstr,
                                                 events_processed, quanta);
                 
-                static const S32 lsl_timer_check_skip = 4;
                 if(isYieldDue())
                 {
                         break;
                 }
-                else if(timer_checks++ == lsl_timer_check_skip)
+                else if(timer_checks++ >= LLScriptExecute::sTimerCheckSkip)
                 {
                         inloop = timer.getElapsedTimeF32();
                         if(inloop > quanta)
@@ -946,9 +960,18 @@ F32 LLScriptExecute::runQuanta(BOOL b_print, const LLUUID &id, const char **erro
                         timer_checks = 0;
                 }
         }
+        if (inloop == 0.0f)
+        {
+                inloop = timer.getElapsedTimeF32();
+        }
         return inloop;
 }
 
+F32 LLScriptExecute::runNested(BOOL b_print, const LLUUID &id, const char **errorstr, F32 quanta, U32& events_processed, LLTimer& timer)
+{
+        return LLScriptExecute::runQuanta(b_print, id, errorstr, quanta, events_processed, timer);
+}
+
 BOOL run_noop(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 {
         if (b_print)
diff --git a/linden/indra/lscript/lscript_execute/lscript_heapruntime.cpp b/linden/indra/lscript/lscript_execute/lscript_heapruntime.cpp
index d502275..df2e489 100644
--- a/linden/indra/lscript/lscript_execute/lscript_heapruntime.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_heapruntime.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_execute/lscript_heapruntime.h b/linden/indra/lscript/lscript_execute/lscript_heapruntime.h
index 69bd80f..ec3d2f9 100644
--- a/linden/indra/lscript/lscript_execute/lscript_heapruntime.h
+++ b/linden/indra/lscript/lscript_execute/lscript_heapruntime.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
index 6dc1474..3b10cc6 100644
--- a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -624,6 +625,16 @@ void LLScriptLSOParse::printStates(LLFILE *fp)
                                                 bytestream2char(name, mRawData, event_offset, sizeof(name));
                                                 fprintf(fp, "\t\tstring %s\n", name);
                                                 break;
+                                        case LSTT_HTTP_REQUEST: // LSTT_HTTP_REQUEST
+                                                bytestream2char(name, mRawData, event_offset, sizeof(name));
+                                                fprintf(fp, "%s\n", name);
+                                                bytestream2char(name, mRawData, event_offset, sizeof(name));
+                                                fprintf(fp, "\t\tkey %s\n", name);
+                                                bytestream2char(name, mRawData, event_offset, sizeof(name));
+                                                fprintf(fp, "\t\tstring %s\n", name);
+                                                bytestream2char(name, mRawData, event_offset, sizeof(name));
+                                                fprintf(fp, "\t\tstring %s\n", name);
+                                                break;
                                         default:
                                                 break;
                                         }
diff --git a/linden/indra/lscript/lscript_execute/lscript_readlso.h b/linden/indra/lscript/lscript_execute/lscript_readlso.h
index 90ebb7b..3b0b75c 100644
--- a/linden/indra/lscript/lscript_execute/lscript_readlso.h
+++ b/linden/indra/lscript/lscript_execute/lscript_readlso.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_execute_mono/assembly.cpp b/linden/indra/lscript/lscript_execute_mono/assembly.cpp
index 4037dfc..01cadba 100644
--- a/linden/indra/lscript/lscript_execute_mono/assembly.cpp
+++ b/linden/indra/lscript/lscript_execute_mono/assembly.cpp
@@ -2,16 +2,27 @@
  * @file llassembly.cpp
  * @brief keeps track of user scripts, ensures that only one copy exists for each
  *
- * $LicenseInfo:firstyear=2007&license=internal$
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
  * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
- * this source code is governed by the Linden Lab Source Code Disclosure
- * Agreement ("Agreement") previously entered between you and Linden
- * Lab. By accessing, using, copying, modifying or distributing this
- * software, you acknowledge that you have been informed of your
- * obligations under the Agreement and agree to abide by those obligations.
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
diff --git a/linden/indra/lscript/lscript_execute_mono/size.cpp b/linden/indra/lscript/lscript_execute_mono/size.cpp
index 6941b45..731eeb9 100644
--- a/linden/indra/lscript/lscript_execute_mono/size.cpp
+++ b/linden/indra/lscript/lscript_execute_mono/size.cpp
@@ -3,16 +3,27 @@
  * @file size.c
  * @brief file from mono samples 
  *
- * $LicenseInfo:firstyear=2007&license=internal$
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
  * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
- * this source code is governed by the Linden Lab Source Code Disclosure
- * Agreement ("Agreement") previously entered between you and Linden
- * Lab. By accessing, using, copying, modifying or distributing this
- * software, you acknowledge that you have been informed of your
- * obligations under the Agreement and agree to abide by those obligations.
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
diff --git a/linden/indra/lscript/lscript_export.h b/linden/indra/lscript/lscript_export.h
index bf00021..d4626a8 100644
--- a/linden/indra/lscript/lscript_export.h
+++ b/linden/indra/lscript/lscript_export.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_http.h b/linden/indra/lscript/lscript_http.h
index b988bb6..86b2d29 100644
--- a/linden/indra/lscript/lscript_http.h
+++ b/linden/indra/lscript/lscript_http.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_library.h b/linden/indra/lscript/lscript_library.h
index dd4b9d4..fa3b06b 100644
--- a/linden/indra/lscript/lscript_library.h
+++ b/linden/indra/lscript/lscript_library.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_library/lscript_alloc.cpp b/linden/indra/lscript/lscript_library/lscript_alloc.cpp
index 5683a70..2d47644 100644
--- a/linden/indra/lscript/lscript_library/lscript_alloc.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_alloc.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_library/lscript_export.cpp b/linden/indra/lscript/lscript_library/lscript_export.cpp
index b108354..e8a3615 100644
--- a/linden/indra/lscript/lscript_library/lscript_export.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_export.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index 2ac45f0..0342c97 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -450,6 +451,12 @@ void LLScriptLibrary::init()
 
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSHA1String", "s", "s", "string llSHA1String(string sr)\nPerforms a SHA1 security Hash.  Returns a 40 character hex string."));
 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetFreeURLs", "i", NULL, "integer llGetFreeURLs()\nreturns the available urls for the current script"));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llRequestURL", "k", NULL, "key llRequestURL()\nRequests one HTTP:// url for use by this object\nTriggers an http_server event with results."));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llRequestSecureURL", "k", NULL, "key llRequestSecureURL()\nRequests one HTTPS:// (SSL) url for use by this object\nTriggers an http_server event with results."));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llReleaseURL", NULL, "s", "llReleaseURL(string url)\nReleases the specified URL, it will no longer be usable."));
+        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."));
 
         // energy, sleep, dummy_func, name, return type, parameters, help text, gods-only
 
diff --git a/linden/indra/lscript/lscript_rt_interface.h b/linden/indra/lscript/lscript_rt_interface.h
index f197d6b..78b6a1d 100644
--- a/linden/indra/lscript/lscript_rt_interface.h
+++ b/linden/indra/lscript/lscript_rt_interface.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,