livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QAR-1075 svn merge -r106114:106224 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel-stats-merge

master
Christian Goetze 2008-12-18 00:39:23 +00:00
parent d2a2b7fd55
commit a8d88418ce
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llcommon/lllog.cpp
View File

@ -45,8 +45,8 @@ public:
LLLogImpl(LLApp* app) : mApp(app) {}
~LLLogImpl() {}
void log(const std::string message, LLSD& info);
bool useLegacyLogMessage(const std::string message);
void log(const std::string &message, LLSD& info);
bool useLegacyLogMessage(const std::string &message);
private:
LLApp* mApp;
@ -54,7 +54,7 @@ private:
//@brief Function to log a message to syslog for streambase to collect.
void LLLogImpl::log(const std::string message, LLSD& info)
void LLLogImpl::log(const std::string &message, LLSD& info)
{
static S32 sequence = 0;
LLSD log_config = mApp->getOption("log-messages");
@ -74,7 +74,7 @@ void LLLogImpl::log(const std::string message, LLSD& info)
}
//@brief Function to check if specified legacy log message should be sent.
bool LLLogImpl::useLegacyLogMessage(const std::string message)
bool LLLogImpl::useLegacyLogMessage(const std::string &message)
{
LLSD log_config = mApp->getOption("log-messages");
if (log_config.has(message))
@ -100,12 +100,12 @@ LLLog::~LLLog()
mImpl = NULL;
}
void LLLog::log(const std::string message, LLSD& info)
void LLLog::log(const std::string &message, LLSD& info)
{
if (mImpl) mImpl->log(message, info);
}
bool LLLog::useLegacyLogMessage(const std::string message)
bool LLLog::useLegacyLogMessage(const std::string &message)
{
if (mImpl)
{

4
indra/llcommon/lllog.h
View File

@ -46,8 +46,8 @@ public:
LLLog(LLApp* app);
virtual ~LLLog();
virtual void log(const std::string message, LLSD& info);
virtual bool useLegacyLogMessage(const std::string message);
virtual void log(const std::string &message, LLSD& info);
virtual bool useLegacyLogMessage(const std::string &message);
private:
LLLogImpl* mImpl;

4
indra/lscript/lscript_execute.h
View File

@ -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);

5
indra/lscript/lscript_execute/lscript_execute.cpp
View File

@ -744,6 +744,11 @@ S32 LLScriptExecuteLSL2::getMajorVersion() const
return major_version;
}
U32 LLScriptExecuteLSL2::getUsedMemory()
{
return getBytecodeSize();
}
LLScriptExecute::LLScriptExecute() :
mReset(FALSE)
{