summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_execute
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-08-14 22:06:38 +0000
committerJosh Bell <josh@lindenlab.com>2008-08-14 22:06:38 +0000
commit6931f129a2346c799bcb44c8e7ade71c425bf627 (patch)
tree07a1f41db0b12de5afcfa2e0c2909a6b1316aee9 /indra/lscript/lscript_execute
parent1a4b8465588a0c271b2c224f68d0e76e26b4c400 (diff)
svn merge -r 93885:94413 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
From 1.23: * DEV-18788 SEC-136: Avatars Link as links instead of sits * DEV-18754 Instant simulator crash using llUnescapeURL * QAR-780 Test the viewer crash reporter in branch crashlogger_vc8@92961 * login.cgi foo by billc * DEV-18732 QA the flow for first landing location change: Help Island + Browser Tutorial * Added email notification of crashloganalyzer.py failures * QAR-802 / DEV-19069 - merge maint-webds-1-23 to Branch_1-23-Server * removed obsolete start-location code Backport fixes from UPCOMING production branch: * DEV-19031 Crash in new Mono code when one object rezzes another with active script * DEV-19050 SVC-2745: llSetLinkPrimitiveParams misbehaving on 1.23 server if avatar is near ground * DEV-16129 Break getStartLocation timeout apart from rest of teleport request failure metric * DEV-14270 Add a column to tp metric to differentiate teleports, local teleports, and region_crossings * DEV-18965 Unable to save scripts when running a sim on windows. * DEV-17376 some region links in Search teleport you without warning * DEV-17796 Sim performance decreases a lot with rezzing physical objects * DEV-19142 SVC-2773: Mono Beta: Script editor "Save" does not save scripts containing syntax errors * Switched serialized data to a vector instead of a GCed Mono array * Made update of cache explicit * Added heartbeats during long derezzes and deletes to stop the launcher killing the sim * DEV-15010 include agent_id in search metrics * DEV-15011 Search metrics not including non 'CLASSIFIED' and 'PLACE' search types * DEV-19288 Broken webservices in 1.24 * DEV-18957 : SCUT : Enable test.py to run tests again a grid database * Remove leading whitespace to work around bug DEV - 19276 (this is NOT a fix for that bug) dataserver-is-deprecated-yo
Diffstat (limited to 'indra/lscript/lscript_execute')
-rw-r--r--indra/lscript/lscript_execute/lscript_execute.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp
index e863c1668e..fe2167aec8 100644
--- a/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -60,6 +60,9 @@ const char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] = /*Flawfinder: ignore*/
"CLI Exception" // LSRF_CLI
};
+void LLScriptExecuteLSL2::startRunning() {}
+void LLScriptExecuteLSL2::stopRunning() {}
+
LLScriptExecuteLSL2::LLScriptExecuteLSL2(LLFILE *fp)
{
U8 sizearray[4];