diff options
| author | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
| commit | 189599b6ff0c4e6b81e761fbc990c057189359f2 (patch) | |
| tree | 1e9e0e91bae9bb1ee53e57ac91cdbbfc9f6dba95 /indra/lscript/lscript_execute/lscript_execute.cpp | |
| parent | fd46865a502036b9e4414e7ec4950faf551b1f14 (diff) | |
Merging from server/server-1.25 back to trunk.
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
Diffstat (limited to 'indra/lscript/lscript_execute/lscript_execute.cpp')
| -rw-r--r-- | indra/lscript/lscript_execute/lscript_execute.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp index 52e3af320c..6280719748 100644 --- a/indra/lscript/lscript_execute/lscript_execute.cpp +++ b/indra/lscript/lscript_execute/lscript_execute.cpp @@ -891,14 +891,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 +909,8 @@ void LLScriptExecute::runInstructions(BOOL b_print, const LLUUID &id, ++events_processed; callEventHandler(event, id, quanta); } - b_done = TRUE; } + b_done = TRUE; } } } @@ -946,6 +945,10 @@ F32 LLScriptExecute::runQuanta(BOOL b_print, const LLUUID &id, const char **erro timer_checks = 0; } } + if (inloop == 0.0f) + { + inloop = timer.getElapsedTimeF32(); + } return inloop; } |