02c3d2fe9b
Merge viewer-eep
2019-07-12 21:08:13 +02:00
b659e5596e
SL-11514
...
Convince Geenzo code to get a little DeMorgan in it.
Trophy Unlocked: make all alpha textures partcipate in picking.
2019-06-28 08:45:07 -07:00
676aa1398c
Merge viewer-eep
2019-05-08 19:18:01 +02:00
c4032528af
Roll back sRGB decode changes from contrib for now.
...
Fix direct light matching across alpha/blended-material/deferred.
Get diffuse lighting to match from Low to Ultra.
2019-05-02 13:49:35 -07:00
52019b64e8
Merge viewer-eep
2019-04-03 18:45:39 +02:00
3a42d2b94a
Whoops! Always make sure that our primary format is assigned.
2019-04-01 18:51:28 -07:00
0e47ca896d
Make LLImageGL's loading of assets as sRGB or linear conditional based upon sRGB decode support.
2019-04-01 18:34:56 -07:00
cc577bfa39
Merge viewer-eep
2019-03-31 10:59:37 +02:00
2513aa0ed1
Additional gamma correction work: start moving over to EXT_texture_sRGB_decode.
2019-03-30 03:18:02 -07:00
0272c47e5a
Tweaked naming a bit, also white space.
...
Will wait for a response from @graham_linden regarding moving the sRGB conversion functions in llmath.h to llrender.
2019-03-29 11:57:45 -07:00
3fa8b844c3
Fixing gamma correction in EEP Step 1:
...
Thou shall always read the sky cubemap as sRGB using hardware sampling.
2019-03-29 02:51:41 -07:00
7fdc689a85
Merge viewer-eep
2019-03-21 20:54:50 +01:00
898c9f4421
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
2019-03-13 13:21:48 -07:00
05d6e376ac
Merge Firestorm LGPL
2018-09-27 22:35:07 +02:00
78866b33a9
Merge
2018-09-26 13:46:45 -07:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
cb20bc0425
Merge viewer-neko
2018-08-01 01:20:01 +02:00
e24d4c9f4d
MAINT-8923 Better allocation failure handling, createGLTexture crashes
2018-07-26 20:06:26 +03:00
4b19e4c1a5
Merged with RLVa tip
2018-06-18 01:09:54 +02:00
fcac8d4b83
Fixed comments
...
--HG--
branch : RLVa
2018-06-17 17:24:09 +02:00
577288d236
Merged with RLVa features & fixes
2018-05-26 18:08:53 +02:00
aa90a47a91
Added @setoverlay set of commands for a certain evil kitty
...
--HG--
branch : RLVa
2018-04-30 00:08:11 +02:00
7b56db31f9
Merge
2018-03-07 11:27:43 -08:00
99b82d9449
Atmospherics WIP
...
libatmosphere integrated in indra/llrender/llatmosphere.cpp
Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
2018-02-18 15:52:23 +00:00
98569f84a2
Merge viewer-neko
2018-01-13 19:11:09 +01:00
7d156389e4
MAINT-8043 Fix for bad_alloc crash in LLImageGL::setImage()
2017-12-18 20:29:50 +02:00
a65b586b18
MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha()
2016-12-08 17:21:05 +02:00
99d76f85f9
MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha()
2016-12-08 17:21:05 +02:00
a1023dd89c
Merge viewer-bear
2016-10-10 22:19:33 +02:00
a14b9cb604
MAINT-6635 Fix for LLImageGL::setSize crash
2016-10-07 03:52:04 +03:00
e925c73ecc
Merge Firestorm LGPL
2016-04-14 13:18:41 +02:00
973965d5ec
Use 64bit integers for texture memory
2016-03-31 11:18:11 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
c78bd2aa1e
Backout 4cf3dd03650a for the time being as we currently do not need it
2015-05-06 09:22:26 +02:00
980ac325ca
FIRE-15947: Setting texmem to 1GB causes bias going up to 5
2015-04-26 20:16:55 +02:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
c307bda68a
Correcting a build error with the release viewer.
2014-05-08 21:58:51 +01:00
f43e46bc9c
MAINT-4009: Ensuring that the pick mask for the LLImageGL is always properly freed during its cleanup method.
2014-04-28 19:44:02 +01:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
0c60e32808
Merge
2013-10-21 16:57:38 -06:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
0e116741a0
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
1616b73ef3
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-08-19 16:12:07 -06:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
9f7bfa1c37
moved unit types out of LLUnits namespace, since they are prefixed
2013-08-15 00:02:23 -07:00
Ansariel