summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10increment viewer version to 6.3.2Nat Goodspeed
2019-09-09MergeGraham Linden
2019-09-09INTL-367Graham Linden
Merge translations
2019-09-09FIX INTL-367 Translation update for Set59 (EEP Viewer, DRTVWR-440)eli
2019-09-09SL-1144Graham Linden
The un-water-fogged gap area was rendering while we were still above water, but the water surface was being near culled. I've re-enabled preculling water objects (which also fixes issues with water culling vs spinning the camera) and it seems to behave correctly.
2019-09-03SL-11543, SL-11443Graham Linden
Fix faullbright/emissive problems.
2019-09-03SL-11856 Backed out SL-11012AndreyL ProductEngine
changeset: 0d43d9754b79
2019-08-30Fix names on sentinels to get doxygen to shaddap.Graham Linden
2019-08-29Merged in maxim_productengine/viewer-eep (pull request #491)Graham Madarasz
SL-11835 FIXED [EEP] Environment settings are shown with general 'object' icon in Inventory Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
2019-08-29Remove unref'd var reintroduced in upstream merges.Graham Linden
2019-08-29SL-11835 FIXED [EEP] Environment settings are shown with general 'object' ↵maxim_productengine
icon in Inventory
2019-08-28Work around issue with friend ops not accepting default params on Clang.Graham Linden
2019-08-28SL-11772Graham Linden
Modify behavior of culling while doing reflection/refraction passes.
2019-08-28SL-11776 [EEP] Reduced frequency of sky updates by comparing data fuzzilyandreykproductengine
2019-08-28SL-11795 Rename Load/Clone/Clear buttonsmaxim_productengine
2019-08-27SL-11519Graham Linden
Remove code for fixing 11370. We *do* want objects in distortion map in Low-Mid after all.
2019-08-27SL-11550Graham Linden
Restore mul by light_transmittance in CPU version of atmospherics.
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-27Merge fixAnsariel
2019-08-27Merged in graham_linden/viewer-eep-g (pull request #486)Graham Madarasz
Default
2019-08-27Move decl of statics inside func to appease Clang, maybe.Graham Linden
2019-08-26Make texture ctrl visibility set respect BOOL vs bool and use better naming.Graham Linden
2019-08-26SL-11706: Correctly load settings when pushing the Load button in the fixed ↵Rider Linden
environment editor.
2019-08-26Fix merged code use of obsoleted vars and other merge errors.Graham Linden
2019-08-26Fix llavatarappearance merge to not use iterator in favor of C++11 lingo.Graham Linden
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-08-26Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-08-26increment viewer version to 6.3.1Nat Goodspeed
2019-08-26MergeRider Linden
2019-08-26SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.Rider Linden
2019-08-23SL-11778Graham Linden
Make RenderShadowResolutionScale work again, also decoupling shadow buffer alloc/release/resize from screen buffer resize function.
2019-08-23SL-11774Graham Linden
Fix diffuse boost when water fog is enabled and make deferred underwater shader participate in EEP/WL param updates by marking it as a water shader.
2019-08-23Remove unused vars to appease Clang.Graham Linden
2019-08-22Best of both worlds for 11776.Graham Linden
2019-08-22SL-11776Graham Linden
Merge both solutions preserving the simpler of the two. Will revisit to catch the new code for timeslicing updates once it is debugged.
2019-08-22SL-11776 Fixed moon's comparison conditionandreykproductengine
2019-08-22SL-11776Graham Linden
Fix false alarming sky updates and doing expensive CPU work for same sky pixels.
2019-08-22SL-11406Graham Linden
Restore code to stomp emissive in the absence of a normal map (to avoid fullbright implying full emissive).
2019-08-22SL-11776 Compensate freeze by spreading calculationsandreykproductengine
2019-08-22SL-11779Graham Linden
Make changing shadow res scale not instantly drop/realloc buffers but wait until display gets to it.
2019-08-16Merged in graham_linden/viewer-eep-g (pull request #478)Graham Madarasz
SL-11589. SL-11212
2019-08-15SL-11662 - apparently a race condition between image loading and material ↵Brad Payne (Vir Linden)
property setting
2019-08-14MergeGraham Linden
2019-08-13MergeGraham Linden
2019-08-13Merge viewer-release 6.2.5Graham Linden
2019-08-13mergeBrad Payne (Vir Linden)
2019-08-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-08-13increment viewer version to 6.2.5Nat Goodspeed
2019-08-13SL-11212Graham Linden
Remove color clamping in determining sun diffuse and moonlight diffuse color from atmo settings.