Ansariel
c4e18fbcaa
Merge viewer-neko
2018-02-27 18:08:48 +01:00
Graham Linden graham@lindenlab.com
06bce2ddd0
Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
...
These changes are only enabled if RenderNsightDebugSupport is true and eliminate use of
some OpenGL legacy functionality which is incompatible with nSight capture
(mostly glReadPixels and other fixed-function pipe rendering calls).
2018-02-15 21:55:24 +00:00
Nat Goodspeed
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
Ansariel
06db7c626f
Merge Firestorm LGPL
2017-10-11 17:58:16 +02:00
Ansariel
615336a4d4
Merge viewer-neko
2017-09-07 21:49:12 +02:00
Nicky
446eaa8375
Merge with phoenix-firestorm-lgpl
2017-06-18 22:37:11 +02:00
andreykproductengine
f8254a9d78
MAINT-7758 Fixed freeze on loading lsl scripts from unicode named windows folder.
2017-08-30 19:57:02 +03:00
Ansariel
94fb8836bf
FIRE-21231: Backed out changeset 14adb7eddc14
2017-06-06 13:25:18 +02:00
Nicky
9d0d42c22b
Merge with FS tip.
2017-05-10 21:25:21 +02:00
Ansariel
87ccdef161
Fix void and region water flickr by Drake Arconis (Alchemy viewer)
2017-04-28 00:13:04 +02:00
Nicky
e19d7a7490
Merge with viewer64.
2017-02-14 19:49:51 +01:00
Oz Linden
c20e57c48f
move debugging globals to the "lowest" library they are referenced in
2016-12-20 14:41:46 -05:00
Ansariel
18dfdc2ae0
Merge bento-box
2016-11-11 16:00:37 +01:00
Brad Payne (Vir Linden)
5fb30e5ad3
MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the skinned matrix and translation into a single mat3x4 for optimal data transfer to reduce uniform slot usage.
2016-11-11 09:37:45 -05:00
Ansariel
1e49facc6c
More VRAM detection logging
2016-07-25 18:51:41 +02:00
Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
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