diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
| commit | dc48f1c7417f0f49ad1bd32330845ce17a29eece (patch) | |
| tree | 8772aff5f32c1702228b7ca7e324fbd077269854 /indra/llcommon/llframetimer.cpp | |
| parent | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (diff) | |
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
Diffstat (limited to 'indra/llcommon/llframetimer.cpp')
| -rw-r--r-- | indra/llcommon/llframetimer.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp index 23d8775824..b74151bc2a 100644 --- a/indra/llcommon/llframetimer.cpp +++ b/indra/llcommon/llframetimer.cpp @@ -140,3 +140,18 @@ F32 LLFrameTimer::getFrameDeltaTimeF32() { return (F32)(U64_to_F64(sFrameDeltaTime) * USEC_TO_SEC_F64); } + + +// static +// Return seconds since the current frame started +F32 LLFrameTimer::getCurrentFrameTime() +{ + U64 frame_time = totalTime() - sTotalTime; + return (F32)(U64_to_F64(frame_time) * USEC_TO_SEC_F64); +} + +// Glue code to avoid full class .h file #includes +F32 getCurrentFrameTime() +{ + return (F32)(LLFrameTimer::getCurrentFrameTime()); +} |