Attempt to fix frame timer on broken mainboards

2012-11-13 02:50:15 +01:00
parent f4016c2e1c
commit 5eb99b7d2f
1 changed files with 5 additions and 0 deletions
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -262,6 +262,11 @@ U64 totalTime()
 			// No wrapping, we're all okay.
 			gTotalTimeClockCount += current_clock_count - gLastTotalTimeClockCount;
 		}
+		else if((gLastTotalTimeClockCount - current_clock_count)<0xFFFF)
+		{
+			//clock is glitching and walking backwards - ignore it
+			gTotalTimeClockCount = gLastTotalTimeClockCount;
+		}
 		else
 		{
 			// We've wrapped.  Compensate correctly