aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llframetimer.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:58 -0500
committerJacek Antonelli2008-08-15 23:44:58 -0500
commit089fc07d207c71ce1401e72f09c31ad8c45872e2 (patch)
tree0028955add042c6f45b47a7b774adeeac9c592cb /linden/indra/llcommon/llframetimer.cpp
parentSecond Life viewer sources 1.16.0.5 (diff)
downloadmeta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.zip
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.gz
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.bz2
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.xz
Second Life viewer sources 1.17.0.12
Diffstat (limited to 'linden/indra/llcommon/llframetimer.cpp')
-rw-r--r--linden/indra/llcommon/llframetimer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp
index 5ae4a6b..2b53e8c 100644
--- a/linden/indra/llcommon/llframetimer.cpp
+++ b/linden/indra/llcommon/llframetimer.cpp
@@ -70,6 +70,12 @@ void LLFrameTimer::reset()
70 mExpiry = sFrameTime; 70 mExpiry = sFrameTime;
71} 71}
72 72
73void LLFrameTimer::resetWithExpiry(F32 expiration)
74{
75 reset();
76 setTimerExpirySec(expiration);
77}
78
73// Don't combine pause/unpause with start/stop 79// Don't combine pause/unpause with start/stop
74// Useage: 80// Useage:
75// LLFrameTime foo; // starts automatically 81// LLFrameTime foo; // starts automatically