Commit Graph

39957 Commits (b465a5bf6f4f63026ff66bfee4671584c47c4119)

Author SHA1 Message Date
Rider Linden b465a5bf6f SL-10387: Inject individual settings. Still freezes parcel/region settings. 2019-01-22 16:53:14 -08:00
Rider Linden 3aed2a4b64 Merge 2019-01-22 09:24:25 -08:00
Rider Linden f42ac5b94e SL-10387: Move settings intjection to a setting object (and out of llEnvironment) 2019-01-22 09:24:11 -08:00
Rider Linden 296dbb9fd0 Merged in graham_linden/viewer-eep-fixes (pull request #231)
SL-10384
2019-01-18 22:07:34 +00:00
Graham Linden d070c56f64 SL-10384
Fix issue with clip plane used in distortion map rendering including objects/avatars above water near surface.
2019-01-18 13:56:12 -08:00
maxim_productengine c00e7dbae1 SL-10380 FIXED 'Day Length/Day Offset' values don't apply to the region from the keyboard by pressing 'Enter' 2019-01-18 14:39:47 +02:00
Graham Linden 066eb59808 SL-10368
Fix OSX shader compile bug from use of #if FOO instead of #ifdef FOO or #if defined(FOO)
preventing atmospherics (and thus ALM) from working on OSX.
2019-01-17 08:32:09 -08:00
Rider Linden 042454bda9 Add Copy/Load/Clear track buttons. Clear track functionality. 2019-01-16 14:05:02 -08:00
maxim_productengine 82a8bcb244 SL-10370 FIXED [EEP] 'Estate' tab is displayed with empty settings after opening 'Region/Estate' floater for the second time 2019-01-16 18:32:12 +02:00
Graham Linden a250140a76 Merge 2019-01-15 16:32:48 -08:00
Graham Linden 9de895aa03 SL-10369
Fix handling of backfaces in shared shadow sampling broken during de-duplication.
2019-01-15 16:06:34 -08:00
Rider Linden ae8f0b9ee3 Merge 2019-01-15 14:41:09 -08:00
Rider Linden 38c84545cc SL-9917: New default sun texture, blank moon is now no image. 2019-01-15 14:40:36 -08:00
maxim_productengine fb75cf03a5 SL-10279 allow drag and drop settings on your own parcel 2019-01-15 18:43:54 +02:00
maxim_productengine a712b96919 SL-10361 fixed overlapping of water setting sliders 2019-01-15 13:04:29 +02:00
maxim_productengine 4aa6506b74 SL-10362 fixed typo in the message 2019-01-15 11:53:53 +02:00
Rider Linden 2a524fe36c Merged in graham_linden/viewer-eep-fixes (pull request #225)
SL-10355
2019-01-14 19:56:42 +00:00
Graham Linden adac468cc1 SL-10355
Modify distortion vec calc in shader to account for modified range of reflection scale above/below.
2019-01-14 11:20:31 -08:00
Rider Linden 506c3b072a SL-10350: If the item is now owned by the current user assume it is in the libary. Don't let them edit. 2019-01-11 16:29:25 -08:00
andreykproductengine 00d8caa359 SL-10279 Finalize drag and drop support 2019-01-10 22:11:11 +02:00
andreykproductengine c0f67e8d6a Fix for lineendings in depthToShadowVolumeG.glsl 2019-01-10 19:54:02 +02:00
andreykproductengine 13c537e9a0 SL-10279 Readjusting altitude slider 2019-01-09 21:57:12 +02:00
Graham Linden 3cb7eb6393 Fix broken underwater rendering and reversed logic in generation of distortion map. 2019-01-09 09:14:59 -08:00
Graham Linden b865fc88e5 Fix broken distortion map rendering (was culling everything).
Clean up deferred\alpha shader to allow re-entrant graphics switching (link error on 2nd compile/link of deferred shaders).

Clean up some uses of pragma(optimize,...).
2019-01-08 17:20:56 -08:00
Graham Linden 0931bbbf96 Merge 2019-01-08 15:26:09 -08:00
Rider Linden f70ab53530 Merged in andreykproductengine/maint-eep (pull request #220)
SL-10060 EEP Add reset default sky altitudes functionality
2019-01-08 23:16:23 +00:00
Rider Linden f2dbca8c5d Merged in graham_linden/viewer-eep-sl-10305 (pull request #221)
SL-10305
2019-01-08 23:14:57 +00:00
Rider Linden c302e4ee96 SL-10268, SL-10323: Use _script_perm to display sit and change env questions. Exp log messages for environment changes." 2019-01-08 15:04:10 -08:00
Graham Linden e13113ab0b SL-10305 fix post deferred gamma correction to address ALM mismatch with non-ALM lighting. 2019-01-08 13:15:00 -08:00
andreykproductengine ac85669c67 SL-10060 EEP Add reset default sky altitudes functionality 2019-01-08 19:54:59 +02:00
Graham Linden 368602fb81 Merge 2019-01-08 09:47:21 -08:00
Rider Linden 84bb8e1167 Merged in andreykproductengine/maint-eep (pull request #219)
SL-10280 Added label repositioning code to display percentage in correct places.

Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
2019-01-08 17:19:27 +00:00
Rider Linden 721a8d20b7 Merged in graham_linden/viewer-eep-sl-10304 (pull request #218)
SL-10304
2019-01-08 17:18:29 +00:00
andreykproductengine 89abadaf2f SL-10280 Added label repositioning code to display percentage in correct places. 2019-01-08 18:38:16 +02:00
Rider Linden 1871f03d12 SL-10067, SL-9917: Updated UUIDs for sun and moon textures and to corrected known skies. 2019-01-07 17:00:01 -08:00
Graham Linden aed659c5b4 SL-10304 fix handling of water normal map blending when both current and next textures are identical. 2019-01-07 16:47:16 -08:00
Rider Linden 1badfb0e96 SL-9883: Hide controls and display message if parcel < 128m 2019-01-07 10:24:55 -08:00
Graham Linden 40208fd820 Merge 2019-01-07 08:19:30 -08:00
Rider Linden 64e45b5b6e SL-10041, SL-9758: Environment tab is disabled(shows can't do this) when EM does not allow parcel override. "Commit" button now reads "Apply to Parcel" or "Apply to Region" as needed. 2019-01-04 17:10:28 -08:00
Graham Linden 75171ee5d1 Merge 2019-01-04 16:18:18 -08:00
Rider Linden e9a2e8f88c Added new LLSINGLETON macro that includes override keyword. 2019-01-04 14:03:02 -08:00
Graham Linden 450d1806b9 Merge 2019-01-04 13:36:58 -08:00
Graham Linden c007e1197c Convert to using shared shadow sampling function (reduce duplicated code blocks in several shaders). 2019-01-04 13:26:47 -08:00
Rider Linden 1ee1a086ce Merge 2019-01-04 13:19:16 -08:00
Rider Linden 0969632b11 Move some estate requests into the LLEstateInfoModel and out of the Region floater.
Fix issue where user could potentially be looking at one set of estate options and update the estate they were standing in by mistake.
2019-01-04 12:32:23 -08:00
Graham Linden c55fa2cf13 Merge 2019-01-04 10:37:31 -08:00
Graham Linden 2312efbf3a Add new shaders for generating shadows from clouds.
Add new class3 shadow shaders for VSM shadows.

Add disabled shadow pass in WLSky for using above.
2019-01-04 10:17:09 -08:00
andreykproductengine 69a84d8172 SL-10279 Fix altitude description repositioning code 2019-01-04 17:09:09 +02:00
Graham Linden 01da53764b Fix per-frag fullbright soft clip convenience funcs to include additive and atten args. 2019-01-03 16:21:07 -08:00
Graham Linden 30fc38603a Fix two files stomped my merging VR before a downstream branch. 2019-01-03 11:22:46 -08:00