Ansariel
|
f4bfb1aadf
|
Merge LL V3.7.9 (AIS3 + SSA)
|
2014-10-22 02:02:08 +02:00 |
|
Brad Payne (Vir Linden)
|
7b9708a2e3
|
sunshine-external merge WIP
|
2014-05-13 10:02:26 -04:00 |
|
Tank_Master
|
6babf8abd2
|
Merge LL 3.7.7
|
2014-06-09 11:29:57 -07:00 |
|
Brad Payne (Vir Linden)
|
1f8b37e9ad
|
merge
|
2013-10-16 11:52:43 -04:00 |
|
Richard Linden
|
80dfbbaacd
|
merge from viewer-release
|
2013-10-08 11:59:24 -07:00 |
|
Richard Linden
|
59628d6f85
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-10-01 14:28:39 -07:00 |
|
Graham Linden
|
95e34d86b9
|
The unbearable lightness of being norspec
|
2013-09-18 18:24:16 -07:00 |
|
Brad Payne (Vir Linden)
|
a3b1a60ed7
|
merge
|
2013-08-22 16:12:40 -04:00 |
|
Xiaohong Bao
|
d8c02bf062
|
Merge
|
2013-08-19 16:09:28 -06:00 |
|
Graham Linden
|
3f186aab77
|
Merge in viewer-release
|
2013-08-19 12:10:40 -07:00 |
|
Nyx Linden
|
5ae117aff6
|
merge with viewer-release
|
2013-08-16 19:31:16 -04:00 |
|
Richard Linden
|
e340009fc5
|
second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
|
2013-08-09 17:11:19 -07:00 |
|
Graham Linden
|
fa74313e7d
|
NORSPEC-314 WIP make work-around easier to flip and add 9800M as an evil mac
|
2013-07-23 04:52:59 -07:00 |
|
Dave Parks
|
79029149a4
|
Automated merge with file:///F:%5Cviewer-bear
|
2013-06-21 12:51:29 -05:00 |
|
Dave Parks
|
9ea2d90a0d
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-06-20 12:10:26 -05:00 |
|
Brad Payne (Vir Linden)
|
a04a706c1b
|
merge
|
2013-05-21 16:18:48 -04:00 |
|
simon
|
ee2fce8790
|
Merge downstream code and viewer-beta
|
2013-05-09 14:10:45 -07:00 |
|
simon
|
c7f7c4bc4d
|
Merge viewer-beta
|
2013-05-09 13:14:49 -07:00 |
|
Graham Madarasz (Graham)
|
d328bfd96e
|
NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect Mac too
|
2013-05-01 11:56:15 -07:00 |
|
Graham Madarasz
|
fd447189c5
|
Merge 3.5.1 into Materials
|
2013-04-25 21:00:16 -07:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
Dave Parks
|
8025b8b2bc
|
NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available
|
2013-04-15 13:16:14 -05:00 |
|
simon
|
066f2acadf
|
Forgot to commit @#! merge
|
2013-04-11 16:23:36 -07:00 |
|
simon
|
b42b789723
|
Merge in downstream code (chui fixes, materials)
|
2013-04-11 16:18:34 -07:00 |
|
simon
|
c7bab8ab8b
|
Merge
|
2013-04-11 16:04:21 -07:00 |
|
Graham Madarasz
|
893bcf34f7
|
NORSPEC-59 work around nV driver crash when doing deferred rendering on NV 9400M/9600M
|
2013-04-09 12:37:57 -07:00 |
|
Oz Linden
|
2fde4a9ae5
|
merge changes for 3.5.0-beta7
|
2013-04-01 14:24:01 -04:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
graham linden
|
14ddfcdf52
|
Merged lindenlab/viewer-development into default
|
2013-03-28 19:16:48 -07:00 |
|
simon
|
98a82c50d5
|
Pull in downstream CHUI code from viewer-development
|
2013-03-25 11:12:52 -07:00 |
|
simon
|
1d8e3997c8
|
Pull and merge latest viewer-beta
|
2013-03-22 14:17:26 -07:00 |
|
prep
|
f345746161
|
Folded in changes from sunshine-stable
|
2013-03-21 11:21:45 -04:00 |
|
prep@lindenlab.com
|
f2948cb1eb
|
Merge with viewer-chui
|
2013-03-20 17:53:51 -05:00 |
|
merov
|
c294c7c474
|
CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux
|
2013-03-16 16:09:50 -07:00 |
|
Don Kjer
|
9150757c81
|
More fixes for gcc-4.6 breakage
|
2013-03-13 21:01:50 +00:00 |
|
Don Kjer
|
662d67e3b5
|
Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures
|
2013-03-13 08:46:59 +00:00 |
|
Dave Parks
|
609ed855e1
|
MAINT-2371 More optimizations.
Reviewed by Graham
|
2013-03-04 18:01:42 -06:00 |
|
Dave Parks
|
f5e5396c3a
|
MAINT-2371 First set of profile guided optimizations.
Reviewed by Graham
|
2013-02-26 15:15:08 -06:00 |
|
Oz Linden
|
8bb3d0891d
|
merge up to 3.4.5-release
|
2013-02-12 13:27:03 -05:00 |
|
Graham Madarasz
|
019c7566fb
|
For MAINT-1291 Code Review: DaveP
|
2013-02-07 09:18:09 -08:00 |
|
Nyx Linden
|
11fe124ae9
|
merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
|
2013-01-24 16:22:49 -05:00 |
|
Tank_Master
|
0c314a0e6f
|
Merge LGPL
|
2013-09-21 16:59:50 -07:00 |
|
Tank_Master
|
05ad3a1c29
|
Merge Viewer-bear (merge of materials + fixes) to FS-exp
|
2013-09-21 11:44:46 -07:00 |
|
Tank_Master
|
5519c39beb
|
Merge Viewer-bear (Materials 3.6.6 RC)
|
2013-09-16 16:18:33 -07:00 |
|
Tank_Master
|
52d9b07503
|
Merge viewer-bear
|
2013-09-12 21:15:34 -07:00 |
|
Tank_Master
|
831e4f443b
|
Merge LL 3.6.3 pass 1
|
2013-08-26 17:09:27 -07:00 |
|
Tank_Master
|
718f6fa0ff
|
merge LL 3.6.1
|
2013-07-10 00:23:23 -07:00 |
|
Tank_Master
|
d4640277d0
|
Merge LL 3.5.3 release.
|
2013-07-09 16:24:58 -07:00 |
|
Tank_Master
|
14001c54df
|
Gastly CHUI merge pass 1, don't count on anything to work.
|
2013-06-26 12:14:54 -07:00 |
|
Cinders
|
a85b1d8e5b
|
FIRE-7603: Revert fix for MAINT-804 because FBO's and deferred rendering appear to be working on Intel cards.
|
2013-04-13 17:23:01 -06:00 |