Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'aleric/master'

Browse Source 
Conflicts:
	indra/newview/lltexturefetch.cpp
	indra/newview/llviewerwindow.cpp
This commit is contained in:
Latif Khalifa
2013-04-23 12:13:54 +02:00
parent ca95c68af5 e12aaa3f5f
commit 5396d17f2a
22 changed files with 857 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/lltimer.cpp
View File

@@ -251,7 +251,7 @@ U64 totalTime()
}
else
{
if (current_clock_count >= gLastTotalTimeClockCount)
if (LL_LIKELY(current_clock_count >= gLastTotalTimeClockCount))
{
// No wrapping, we're all okay.
gTotalTimeClockCount += current_clock_count - gLastTotalTimeClockCount;