Second Life viewer sources 1.21.0-RC

1 files changed, 11 insertions, 14 deletions

diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp
index 25d9897..967570d 100644
--- a/linden/indra/llcommon/lltimer.cpp
+++ b/linden/indra/llcommon/lltimer.cpp
@@ -429,10 +429,9 @@ BOOL LLTimer::knownBadTimer()
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-U32 time_corrected()
+time_t time_corrected()
 {
-        U32 corrected_time = (U32)time(NULL) + gUTCOffset;
-        return corrected_time;
+        return time(NULL) + gUTCOffset;
 }
 
 
@@ -452,27 +451,25 @@ BOOL is_daylight_savings()
 }
 
 
-struct tm* utc_to_pacific_time(S32 utc_time, BOOL pacific_daylight_time)
+struct tm* utc_to_pacific_time(time_t utc_time, BOOL pacific_daylight_time)
 {
-        time_t unix_time = (time_t)utc_time;
-
         S32 pacific_offset_hours;
         if (pacific_daylight_time)
         {
-                pacific_offset_hours = -7;
+                pacific_offset_hours = 7;
         }
         else
         {
-                pacific_offset_hours = -8;
+                pacific_offset_hours = 8;
         }
 
         // We subtract off the PST/PDT offset _before_ getting
         // "UTC" time, because this will handle wrapping around
         // for 5 AM UTC -> 10 PM PDT of the previous day.
-        unix_time += pacific_offset_hours * MIN_PER_HOUR * SEC_PER_MIN;
+        utc_time -= pacific_offset_hours * MIN_PER_HOUR * SEC_PER_MIN;
  
         // Internal buffer to PST/PDT (see above)
-        struct tm* internal_time = gmtime(&unix_time);
+        struct tm* internal_time = gmtime(&utc_time);
 
         /*
         // Don't do this, this won't correctly tell you if daylight savings is active in CA or not.
@@ -486,7 +483,7 @@ struct tm* utc_to_pacific_time(S32 utc_time, BOOL pacific_daylight_time)
 }
 
 
-void microsecondsToTimecodeString(U64 current_time, char *tcstring)
+void microsecondsToTimecodeString(U64 current_time, std::string& tcstring)
 {
         U64 hours;
         U64 minutes;
@@ -504,11 +501,11 @@ void microsecondsToTimecodeString(U64 current_time, char *tcstring)
         subframes = current_time / (U64)42;
         subframes %= 100;
 
-        sprintf(tcstring,"%3.3d:%2.2d:%2.2d:%2.2d.%2.2d",(int)hours,(int)minutes,(int)seconds,(int)frames,(int)subframes);              /* Flawfinder: ignore */
+        tcstring = llformat("%3.3d:%2.2d:%2.2d:%2.2d.%2.2d",(int)hours,(int)minutes,(int)seconds,(int)frames,(int)subframes);
 }
 
 
-void secondsToTimecodeString(F32 current_time, char *tcstring)
+void secondsToTimecodeString(F32 current_time, std::string& tcstring)
 {
         microsecondsToTimecodeString((U64)((F64)(SEC_TO_MICROSEC*current_time)), tcstring);
 }
@@ -541,7 +538,7 @@ void LLEventTimer::updateClass()
         {
                 LLEventTimer* timer = *iter++;
                 F32 et = timer->mEventTimer.getElapsedTimeF32();
-                if (et > timer->mPeriod) {
+                if (timer->mEventTimer.getStarted() && et > timer->mPeriod) {
                         timer->mEventTimer.reset();
                         if ( timer->tick() )
                         {