1 files changed, 45 insertions, 0 deletions

diff --git a/linden/indra/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp
index d41f904..5ae4a6b 100644
--- a/linden/indra/llcommon/llframetimer.cpp
+++ b/linden/indra/llcommon/llframetimer.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -52,6 +53,50 @@ void LLFrameTimer::updateFrameTime()
         sFrameCount++;
 } 
 
+void LLFrameTimer::start()
+{
+        reset();
+        mStarted = TRUE;
+}
+
+void LLFrameTimer::stop()
+{
+        mStarted = FALSE;
+}
+
+void LLFrameTimer::reset()
+{
+        mStartTime = sFrameTime;
+        mExpiry = sFrameTime;
+}
+
+// Don't combine pause/unpause with start/stop
+// Useage:
+//  LLFrameTime foo; // starts automatically
+//  foo.unpause(); // noop but safe
+//  foo.pause(); // pauses timer
+//  foo.unpause() // unpauses
+//  F32 elapsed = foo.getElapsedTimeF32() // does not include time between pause() and unpause()
+//  Note: elapsed would also be valid with no unpause() call (= time run until pause() called)
+void LLFrameTimer::pause()
+{
+        if (mStarted)
+                mStartTime = sFrameTime - mStartTime; // save dtime
+        mStarted = FALSE;
+}
+
+void LLFrameTimer::unpause()
+{
+        if (!mStarted)
+                mStartTime = sFrameTime - mStartTime; // restore dtime
+        mStarted = TRUE;
+}
+
+void LLFrameTimer::setTimerExpirySec(F32 expiration)
+{
+        mExpiry = expiration + mStartTime;
+}
+
 void LLFrameTimer::setExpiryAt(F64 seconds_since_epoch)
 {
         mStartTime = sFrameTime;