Second Life viewer sources 1.18.1.2

1 files changed, 7 insertions, 7 deletions

diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp
index 21fbf0e..6077063 100644
--- a/linden/indra/llcommon/lltimer.cpp
+++ b/linden/indra/llcommon/lltimer.cpp
@@ -37,7 +37,7 @@
 #       include <winsock2.h>
 #       include <windows.h>
 #       include <time.h>
-#elif LL_LINUX
+#elif LL_LINUX || LL_SOLARIS
 #       include <time.h>
 #       include <sys/time.h>
 #       include <sched.h>
@@ -90,7 +90,7 @@ void llyield()
 {
         SleepEx(0, TRUE); // Relinquishes time slice to any thread of equal priority, can be woken up by extended IO functions
 }
-#elif LL_LINUX
+#elif LL_LINUX || LL_SOLARIS
 void ms_sleep(long ms)
 {
         struct timespec t;
@@ -150,7 +150,7 @@ F64 calc_clock_frequency(U32 uiMeasureMSecs)
 #endif // LL_WINDOWS
 
 
-#if LL_LINUX || LL_DARWIN
+#if LL_LINUX || LL_DARWIN || LL_SOLARIS
 // Both Linux and Mac use gettimeofday for accurate time
 F64 calc_clock_frequency(unsigned int uiMeasureMSecs)
 {
@@ -169,7 +169,7 @@ U64 get_clock_count()
 
 void update_clock_frequencies()
 {
-        gClockFrequency = calc_clock_frequency(50);
+        gClockFrequency = calc_clock_frequency(50U);
         gClockFrequencyInv = 1.0/gClockFrequency;
         gClocksToMicroseconds = gClockFrequencyInv * SEC_TO_MICROSEC;
 }
@@ -512,7 +512,7 @@ void secondsToTimecodeString(F32 current_time, char *tcstring)
 std::list<LLEventTimer*> LLEventTimer::sActiveList;
 
 LLEventTimer::LLEventTimer(F32 period)
-: mTimer()
+: mEventTimer()
 {
         mPeriod = period;
         sActiveList.push_back(this);
@@ -528,9 +528,9 @@ void LLEventTimer::updateClass()
         for (std::list<LLEventTimer*>::iterator iter = sActiveList.begin(); iter != sActiveList.end(); ) 
         {
                 LLEventTimer* timer = *iter++;
-                F32 et = timer->mTimer.getElapsedTimeF32();
+                F32 et = timer->mEventTimer.getElapsedTimeF32();
                 if (et > timer->mPeriod) {
-                        timer->mTimer.reset();
+                        timer->mEventTimer.reset();
                         timer->tick();
                 }
         }