summaryrefslogtreecommitdiff
path: root/indra/newview/llsettingsvo.cpp
AgeCommit message (Collapse)Author
2022-07-28Creating an LLVector4 from LLColor3 causes an array out of bounds read on ↵ZiRee
reading .mV[3]. Doing a detour via LLVector3 fixes this but maybe there is a less roundabout way.
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-01-14SL-16606: Add profiler category SHADERPtolemy
2022-01-14SL-16606: Add profiler category ENVIRONMENTPtolemy
2022-01-14SL-16606: Add profiler category DRAWPOOLPtolemy
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-10-29Fix merge conflictPtolemy
2021-10-19SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument ↵Dave Parks
LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead.
2021-09-20SL-11793 Fallback for 'Day' preset importingAndrey Kleshchev
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-08-18Merge branch 'master' 6.4.8 into DRTVWR-497Dave Houlton
2020-07-22LLExtStat had been a S32, this wasn't right, as some of the constants lead ↵Nicky Dasmijn
to integer overflow: const LLExtStat LL_EXSTAT_RES_RESULT = 2L<<30; const LLExtStat LL_EXSTAT_VFS_RESULT = 3L<<30; This shifts into the sign bit and clang gets (rightfully) upset about this. LLExtStatus needs to be at least of type U32 to remedy this problem, but while at it it makes sense to turn it into what it is: An enum. Turning it into a class enum has the added benefit we get type safety for mostly free. Which incidentally turned up a problem right away: A call to removeAndCallbackPendingDownloads had status and extstatus reversed and thus was wrong.
2020-06-13SL-13084 Combined commit for the EEP specular color fixDave Houlton
SL-13084: Fix clouds flipped along East/West axis to match texture preview Cloud Image and direction to match Cloud Scroll SL-13804: Fix clouds flipped along East/West axis to match texture preview Cloud Image and direction to match Cloud Scroll SL-13084: Fix inverted cloud scroll with ALM is off SL-13084: Move texture coords section to top in class2/windlight/cloudsV to match class1/deffered/cloudsV SL-13084: Add references to other common files
2020-03-27SL-12911 Add Debug setting EnvironmentPersistAcrossLoginAndrey Kleshchev
2019-12-20SL-11606 final tweak of non-ALM lights strengthDave Houlton
2019-12-19SL-11606 fix to match EEP light falloff vs releaseDave Houlton
2019-08-27SL-11055Graham Linden
Remedy cloud_shadow and hack halving being done twice to ambient in some cases (i.e. artificial dimunition of necessary bullshit factor).
2019-08-26SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.Rider Linden
2019-07-23SL-11621Graham Linden
Remove all references to unused shader var global_gamma. Remove many unused decls for gamma from shaders. Make post-deferred gamma correction use display_gamma. Make setting display_gamma use the correct RenderDeferredDisplayGamma setting.
2019-06-06SL-11367Graham Linden
Use rotated lightnorm directly in water shader instead of forcing all shaders marked as water (including lighting) to get that norm (where it would only affect Mid as only that graphics mode has atmospherics on but isn't using deferred rendering).
2019-05-29MergeGraham Linden
2019-05-29SL-11247Graham Linden
Fix underwater water fog density modifier being used when not underwater.
2019-05-24SL-11287 [EEP] Importing certain legacy windlights give upload errorandreykproductengine
2019-05-21SL-11238Graham Linden
Fix ambient light inputs to the renderer. Fix 3rd sky shader w/ mistaken density mod conversion. Make ambient clamp apply to all modes. Tune ALM ambient clamp to match non-ALM.
2019-05-17SL-11112Graham Linden
Fix blend between reflected/refracted water maps (make less transparent) and fix setting of water fog color alpha on low end to better match prev behavior of setting the internal control value in that case.
2019-05-09SL-11008: Do not adjust imported windlight density and distance multipliers.Rider Linden
2019-05-03Make sure cloud_color has non-garbage alpha (no offense to 4.59e-41).Graham Linden
2019-05-02Roll back sRGB decode changes from contrib for now.Graham Linden
Fix direct light matching across alpha/blended-material/deferred. Get diffuse lighting to match from Low to Ultra.
2019-04-10SL-10925, SL-10926, SL-10896Graham Linden
New fix for 925/926 that doesn't cause 896 again. Also linearize moon disc tex color.
2019-04-09SL-10925, SL-10926Graham Linden
Restore letting env auto-update sunlight_color uniform (other shaders expect it even if lighting does not).
2019-04-08SL-10912Graham Linden
Fix conversion of star brightness, density mult, and distance mult to legacy ranges. Make settings look in both legacyhaze and top-level settings for haze params.
2019-04-05SL-10896Graham Linden
Fix deferred water soften prog lightnorm getting stomped with rotated lightnorm, because it's a water shader and needs water atmo uniform values, but it's a deferred lighting shader that needs not-so-rotated lightnorms. Make sunlight_color not get auto-updated so we can get the correct value from mSunDiffuse. Remove mix to preserve bumps as it was washing out shadows.
2019-02-20SL-9660: Next pass cleanup. Removed and downgraded a number of logs. ↵Rider Linden
Removed refs to LAPAS. Better sync with legacy regions.
2019-02-13SL-10181, SL-10546Graham Linden
Fix distortion map rendering in deferred mode not including underwater fog effects. Fix distortion map rendering not including post-deferred content at all. Fix distortion map rendering not including anything but sky when camera is underwater. Update sun_up_factor/sunmoon_glow_factor uniforms even when sun disc isn't in use.
2019-01-30SL-9925: Viewer now shows an error message if import from legacy windlight ↵Rider Linden
fails.
2019-01-08SL-10305 fix post deferred gamma correction to address ALM mismatch with ↵Graham Linden
non-ALM lighting.
2018-12-20SL-10274 FIXED [EEP] Settings object created by Save As cannot be copied ↵maxim_productengine
from an object
2018-10-31SL-9924 [EEP] Environment Settings permissions can be dropped by Save As buttonandreykproductengine
2018-11-01SL-10000 fix storing of ambient value when converting legacy settingsGraham Linden
2018-10-29SL-1476 EEP Better shader resets and transitionsandreykproductengine
2018-10-19MergeGraham Linden
2018-10-18Port sim-side changes to back-conversion of new settings to legacy.Graham Linden
Fix validating of density multiplier to clamp >= 0.0001f. Port fix to setter for ambient color in sky settings.
2018-10-17SL-9889: New reconverted default assetsRider Linden
2018-10-17SL-9853 FIXED [EEP] Default Settings object cannot be copied by other users.maxim_productengine