52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
87ba85eaab
diff -r 59c7bed66dfd indra/llcommon/lleventapi.h
2013-04-24 09:35:38 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
438ceeb008
BUILDFIX: merge cleanup
...
A couple of merge issues that caused the resulting code to not build.
2013-01-25 17:58:11 -05:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
d48889198b
MAINT-1486 FIX Crash on login (Unhandled exception)
...
open root timer by default
2012-08-30 19:23:17 -07:00
afc2807302
MAINT-1486 FIX Crash on login (Unhandled exception)
...
cleaner implementation of llfasttimers...don't bother to share similarly named timers
just create multiple timers with same name...doesn't break anything
2012-08-30 18:35:29 -07:00
a98c7e150b
llfasttimer cleanup
...
removed unnecessary cache miss from fast timers
renamed llfasttimer_class back to llfasttimer
2012-08-06 16:08:04 -07:00
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
aa0fe4c689
Fix for last commit: got the test backwards.
2013-02-18 08:22:17 -06:00
c08a93d865
Don't spam the log with unneeded fast timer accuracy messages.
2013-02-18 08:05:33 -06:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
Tank_Master