summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2019-02-13Merged in graham_linden/viewer-eep-fixes (pull request #276)Rider Linden
SL-10181, SL-10546
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-02-12SL-10406, SL-10464: Remove experience injections and destroy push ↵Rider Linden
environment when finished.
2019-02-11MergeRider Linden
2019-02-11SL-10406, SL-10464: Experience injections now have their own sub class of ↵Rider Linden
day instance (DayInjection) Montitors underlying environments and switches the sources as needed.
2019-02-11Merged in graham_linden/viewer-eep-fixes (pull request #275)Rider Linden
SL-10500
2019-02-11SL-10500Graham Linden
Replace clamp on height in atmospherics calcs on fragment shader path. Fix colorspace conversions in material shaders in forward rendering mode. Fix deferred shaders not setting the sun_up_factor uniform and getting moonlight instead of sunlight.
2019-02-11Merged in graham_linden/viewer-eep-fixes (pull request #274)Rider Linden
SL-10457, SL-10414
2019-02-08SL-10414Graham Linden
2019-02-08Merged in graham_linden/viewer-eep-fixes (pull request #273)Rider Linden
SL-10478, SL-10486, SL-10501, SL-10415, SL-10487
2019-02-08SL-10457Graham Linden
Make area beyond far split of directional light unshadowed again.
2019-02-08Detabify.Graham Linden
2019-02-08Replace funcs dropped in merge.Graham Linden
2019-02-08Merge SL-10501 fixGraham Linden
2019-02-08SL-10501Graham Linden
Remove assert and replace with warning when rigged mesh tries to use tex anim on tex index > 1.
2019-02-08SL-10415Graham Linden
Another pass at playing with shadow_offset/bias to balance between peter-panning and shadow acne while sun and/or moon are near the horizon.
2019-02-08SL-10509 EEP Settings Picker gets closed by drag&dropandreykproductengine
2019-02-07SL-10486, SL-10501, SL-10487Graham Linden
Make moon texture from default daycycle the default moon texture id and use it for the default and blank assets in the picker. Fix handling of MM_TEXTURE to correctly detect when texture units outside the range 0-3 are used with texture matrix ops to prevent mem overwrite bug and/or asserts.
2019-02-07SL-10486Graham Linden
Use brighter moon texture for both default and blank moon texture ids in picker.
2019-02-07MergeGraham Linden
2019-02-07Fix apply of model matrix expecting upstream code to be in the correct ↵Graham Linden
matrix mode (which was not true as the assert on same fired).
2019-02-07SL-10495 [EEP] Include a confirmation when clicking the Use Region Settings ↵maxim_productengine
button
2019-02-07SL-10456 FIXED [EEP] Viewer continues to show last EEP environment after ↵maxim_productengine
teleporting from EEP to non-EEP region
2019-02-06SL-10478Graham Linden
Fix side-effects of having both sun and moon as potential directional light contributors. We pass an int to the shader indicating which to prefer instead of making per-pixel decisions and pass the moonlight color/di independently. Obsolete llsettingssky fade color which was unused elsewhere and cached for no reason.
2019-02-06Merged in graham_linden/viewer-eep-fixes (pull request #269)Rider Linden
SL-10461
2019-02-06SL-10461Graham Linden
Another attempt at getting approximage handling of projector ambiance in the alpha object shader. This will not be a perfect match for non-transparent objects but should be close enough.
2019-02-06Backed out changeset: 43f8558c602bandreykproductengine
2019-02-06SL-10485 Double-click should check visibility and open foldersandreykproductengine
2019-02-05Better calculation of time remaining in span for track animator (from SL-10465)Rider Linden
2019-02-05Merged in andreykproductengine/maint-eep (pull request #264)Rider Linden
SL-10279 Use stored environment instead of region one Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
2019-02-05temp fogandreykproductengine
2019-02-05SL-10443Graham Linden
Make fix which gets 10276 and 10443, but leaves the bizarre flip at the zenith so that the sun/moon textures are always upright w.r.t the viewer.
2019-02-05SL-10304Graham Linden
Fix panel_settings_water increments for Underwater Modifier and wave directions.
2019-02-05SL-10279 Use stored environment instead of region oneandreykproductengine
2019-02-04Merged in graham_linden/viewer-eep-fixes (pull request #263)Rider Linden
SL-10459, SL-10461
2019-02-04SL-10461Graham Linden
Pass projector ambiance as the .w element of the light_attenuation uniform so that alpha shader can emulate the behavior of proper spot projectors.
2019-02-04SL-10459Graham Linden
Use gl_FragDepth on deferred sun disc to fix z-fighting with sky dome and get layering of sky/stars/sun/moon/clouds correct.
2019-02-04SL-9698 Restore code line after the mergemaxim_productengine
2019-02-01Merged in graham_linden/viewer-eep-fixes (pull request #261)Rider Linden
SL-9996, SL-1130, SL-5546
2019-02-01Remove MSVC pragma to make debugging feasible in RelWithDebInfo.Graham Linden
2019-02-01SL-9996, SL-1130, SL-5546Graham Linden
Fix bug with setting texture matrix for rigged mesh. Fix z-fighting between sea and sky in ALM by cheating sky, stars, and moon using gl_FragDepth. Fix handling of atmospheric haze glow w.r.t independent sun/moon positioning (we can no longer depend on them being mutex to each other).
2019-02-01Merged in graham_linden/viewer-eep-fixes (pull request #259)Rider Linden
Fix for OSX shader compiler knock-on
2019-02-01Remove one more piece of attempted 9996 fix on ALM.Graham Linden
2019-02-01Roll back attempted fix for 9996 on ALM which has unacceptable knock-on effects.Graham Linden
2019-02-01Fix issue with OSX shader compiler not implementing #if correctly (nice job, ↵Graham Linden
Timmy).
2019-02-01SL-9851 Adjust UI limitsandreykproductengine
2019-02-01Merged in andreykproductengine/maint-eep (pull request #254)Rider Linden
SL-1531 Hover highlight should be consistent with mouse selection
2019-02-01SL-10364 FIXED Parcel Sky Altitudes not set correct when opening About Land ↵maxim_productengine
-> Environment for the first time upon region arrival
2019-02-01SL-1531 Hover highlight should be consistent with mouse selectionandreykproductengine
2019-01-31Merged in graham_linden/viewer-eep-fixes (pull request #253)Rider Linden
SL-10443, SL-9994, SL-10374, SL-10081