Second Life viewer sources 1.23.0-RC

9 files changed, 313 insertions, 11 deletions

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,