diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
| commit | f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 (patch) | |
| tree | db55a74f8d18b3c366608a537e2a32f6d089d56f /indra/llcommon/llframetimer.h | |
| parent | 680667d4bdca7e2a6df15cd6f16f34c12c97da8e (diff) | |
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
Diffstat (limited to 'indra/llcommon/llframetimer.h')
| -rw-r--r-- | indra/llcommon/llframetimer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h index c7c1c50c7b..da777e4ee6 100644 --- a/indra/llcommon/llframetimer.h +++ b/indra/llcommon/llframetimer.h @@ -55,6 +55,7 @@ public: void start(); void stop(); void reset(); + void resetWithExpiry(F32 expiration); void pause(); void unpause(); void setTimerExpirySec(F32 expiration); |