Shyotl
54771409d6
Merge branch 'master' into sunshine
...
Conflicts:
indra/llimage/llimage.cpp
indra/llui/llui.cpp
indra/newview/llvoavatar.cpp
2013-01-08 17:05:29 -06:00
Shyotl
d71210e942
Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)
2013-01-07 14:44:54 -06:00
Siana Gearz
ddef80d2cf
Revert "Attempt to fix frame timer on broken mainboards"
...
This reverts commit 5eb99b7d2f
2013-01-03 03:02:15 +01:00
Siana Gearz
5eb99b7d2f
Attempt to fix frame timer on broken mainboards
2012-11-13 02:50:15 +01:00
Aleric Inglewood
5a455eac91
Fixed LLFastTimers et al.
...
No longer crash when std::vector moves in memory when it grows.
Fixed display of timer values (in ms).
2012-02-05 05:35:01 +01:00
Shyotl
1f187b09ee
LLCommon cleanup and updating to V2 (V3 now, I guess.)
2011-08-27 01:57:10 -05:00
Shyotl
51338470b5
Pulled LLEventTimer out of lltimer.h/cpp and into lleventtimer.h/cpp
...
LLInstanceTracker added to llcommon (pulled from llui in v2 for usage elsewhere)
LLEventTimer now using LLInstanceTracker
Updated LLLiveAppConfig (Though it appears unused, really)
processor.h is obsolete, thus removed. (llprocessor.h replaces it)
2011-05-15 22:40:59 -05:00
Siana Gearz
d68736da39
Put in some changes along sg1.4 dev history.
2010-11-21 15:57:44 +01:00
Hazim Gazov
7a86d01598
Imported existing code
2010-04-02 02:48:44 -03:00
