Second Life viewer sources 1.15.0.2

1 files changed, 9 insertions, 7 deletions

diff --git a/linden/indra/llcommon/llframetimer.h b/linden/indra/llcommon/llframetimer.h
index 007fe7d..0366e09 100644
--- a/linden/indra/llcommon/llframetimer.h
+++ b/linden/indra/llcommon/llframetimer.h
@@ -5,6 +5,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
@@ -63,8 +64,7 @@ public:
                 return sTotalSeconds;
         }
 
-        // Call this method once per frame to update the current frame
-        // time.
+        // Call this method once per frame to update the current frame time.
         static void updateFrameTime();
 
         static S32  getFrameCount()                                             { return sFrameCount; }
@@ -72,10 +72,12 @@ public:
         static F32      getFrameDeltaTimeF32();
 
         // MANIPULATORS
-        void start()                                                                    { reset(); mStarted = TRUE; }
-        void stop()                                                                             { mStarted = FALSE; }
-        void reset()                                                                    { mStartTime = sFrameTime; mExpiry = sFrameTime; }
-        void setTimerExpirySec(F32 expiration)                  { mExpiry = expiration + mStartTime; }
+        void start();
+        void stop();
+        void reset();
+        void pause();
+        void unpause();
+        void setTimerExpirySec(F32 expiration);
         void setExpiryAt(F64 seconds_since_epoch);
         BOOL checkExpirationAndReset(F32 expiration);
         F32 getElapsedTimeAndResetF32()                                 { F32 t = F32(sFrameTime - mStartTime); reset(); return t; }
@@ -85,7 +87,7 @@ public:
         // ACCESSORS
         BOOL hasExpired() const                                                 { return (sFrameTime >= mExpiry); }
         F32  getTimeToExpireF32() const                                 { return (F32)(mExpiry - sFrameTime); }
-        F32  getElapsedTimeF32() const                                  { return (F32)(sFrameTime - mStartTime); }
+        F32  getElapsedTimeF32() const                                  { return mStarted ? (F32)(sFrameTime - mStartTime) : (F32)mStartTime; }
         BOOL getStarted() const                                                 { return mStarted; }
 
         // return the seconds since epoch when this timer will expire.