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.h | |
| 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.h')
| -rw-r--r-- | indra/llcommon/llframetimer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h index 9d55fd1a0b..2998560ab9 100644 --- a/indra/llcommon/llframetimer.h +++ b/indra/llcommon/llframetimer.h @@ -74,6 +74,9 @@ public: static F32 getFrameDeltaTimeF32(); + // Return seconds since the current frame started + static F32 getCurrentFrameTime(); + // MANIPULATORS void start(); void stop(); @@ -144,4 +147,7 @@ protected: BOOL mStarted; }; +// Glue code for Havok (or anything else that doesn't want the full .h files) +extern F32 getCurrentFrameTime(); + #endif // LL_LLFRAMETIMER_H |