diff options
| author | Christian Goetze <cg@lindenlab.com> | 2008-12-18 00:39:23 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2008-12-18 00:39:23 +0000 |
| commit | a8d88418ce8d716df2d7b7eb94af8a04c81cb1ca (patch) | |
| tree | 362bb08472a471181ba5ad127f138e5f09b4d8c0 /indra/lscript | |
| parent | d2a2b7fd552135b66aa7753eba4833b1197557b5 (diff) | |
QAR-1075 svn merge -r106114:106224 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel-stats-merge
Diffstat (limited to 'indra/lscript')
| -rw-r--r-- | indra/lscript/lscript_execute.h | 4 | ||||
| -rw-r--r-- | indra/lscript/lscript_execute/lscript_execute.cpp | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/lscript/lscript_execute.h b/indra/lscript/lscript_execute.h index 2f67e77c93..c0a0afa71c 100644 --- a/indra/lscript/lscript_execute.h +++ b/indra/lscript/lscript_execute.h @@ -402,6 +402,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. @@ -493,7 +495,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/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp index 6280719748..fff005b7bc 100644 --- a/indra/lscript/lscript_execute/lscript_execute.cpp +++ b/indra/lscript/lscript_execute/lscript_execute.cpp @@ -744,6 +744,11 @@ S32 LLScriptExecuteLSL2::getMajorVersion() const return major_version; } +U32 LLScriptExecuteLSL2::getUsedMemory() +{ + return getBytecodeSize(); +} + LLScriptExecute::LLScriptExecute() : mReset(FALSE) { |