339c3c5df4
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-18 18:55:37 +01:00
ebffbd3c9a
SL-14575 Pass validation flags into EEP validators.
2021-01-13 20:47:20 +02:00
c7804dbf7e
Merge remote-tracking branch 'll/d476' into fs-vs2017-d476
2020-07-20 11:53:09 +02:00
f627140cf1
DRTVWR-476, SL-13467: Make LLTrace::BlockTimerStatHandle keys unique.
...
There are duplicate LLTrace::BlockTimerStatHandle key strings declared in
llsettingsdaycycle.cpp and llsettingswater.cpp -- the only instances of
duplicate BlockTimerStatHandle keys in the viewer code base. SL-13467 tracks
intentional crashes due to duplicate LLInstanceTracker subclass instances with
one of those keys. The simplest experiment to try to eliminate those crashes
is to ensure that every BlockTimerStatHandle in the code base is unique.
2020-06-19 12:33:15 -04:00
846d78345c
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-04-01 15:00:34 +02:00
6620211bff
SL-12911 Add Debug setting EnvironmentPersistAcrossLogin
2020-03-27 00:24:08 +02:00
3c158f981a
Merge DRTVWR-440
2020-01-31 12:44:28 +01:00
16699fe8a5
SL-12591 Fixed float comparison
2020-01-23 16:29:43 +02:00
95baae0235
Merge viewer-eep
2019-05-09 18:48:19 +02:00
22fc3409f4
SL-10878: Update default day cycle asset ID
2019-05-08 14:30:09 -07:00
f917c39b4f
Initial QP day cycle slider to see if method is viable
2019-04-04 02:13:55 -07:00
fdcf1b8783
SL-10818 FIXED [EEP] Wrong selection when keyframes are close together
2019-03-27 17:06:45 +02:00
2401712d10
SL-9660: Next pass cleanup. Removed and downgraded a number of logs. Removed refs to LAPAS. Better sync with legacy regions.
2019-02-20 15:20:30 -08:00
70ac8d9fa7
SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment.
2018-12-12 14:07:23 -08:00
6cdcc7fe2e
SL-9889: New reconverted default assets
2018-10-17 12:16:24 -07:00
598cd8a30f
MAINT-9066 EEP should not be able to delete all Keyframes from Ground Level or Water
2018-09-10 17:31:31 +03:00
f33d3a40bb
Merge
2018-08-17 12:38:08 -07:00
597d28ad34
Fix constness of LLSettingsVODay::buildDeepCloneAndUncompress.
2018-08-16 22:00:53 +01:00
d4aa55eade
Merge
2018-08-15 13:37:54 -07:00
eadf0b9101
MAINT-8990, MAINT-9002: First pass rework on environment panels, region/parcel
2018-08-15 13:35:53 -07:00
584fec695b
MAINT-8952 EEP 'uncompress' day tracks before editing
2018-08-15 18:31:07 +03:00
133900d31a
Miss an || && in an if
2018-08-08 16:22:04 -07:00
881ee670d9
Fix for mac build
...
MAINT-8870, MAINT-8871: When legacy windlight fails load the default day cycle asset and use that.
2018-08-08 15:41:28 -07:00
51abc168c0
MAINT-8902 fix encroaching 'legacy' issues
2018-08-03 21:01:43 +03:00
21c6e6063f
MAINT-8952 EEP Changing one Day Cycle Keyframe can change other keyframes
2018-08-06 16:22:06 +03:00
3f6cedbbf3
Synch settings with simulator.
2018-08-03 16:32:31 -07:00
9391744164
Add default and wellknown asset ids.
2018-07-16 16:49:49 -07:00
8969b11435
MAINT-8838 render a sun disc if the texture(s) are provided by WL settings (default is no sun disc and just haze)
...
Refactor sky texture optimization to retain building the cubemap used by shiny.
2018-07-03 16:37:32 +01:00
5c2f49b865
Make distinct ALM moon shader, tweak mix factor for day vs night moon shading, and fix transposed name of daycycle func.
2018-06-27 22:00:50 +01:00
a02b3500b9
Make LLSettingsFoo::defaults() funcs only calculate the invariant values once (use static trick ala the validations).
...
Fix conversion of legacy settings w/ non-zero east angles to account for those values being CW radian angles.
2018-06-22 00:41:19 +01:00
66d78ce1c7
Make water and sky defaults take a position value to allow for default daycycle w/ multiple frames.
...
Make default daycycle add 8 frames at 0, 0.125, 0.25 etc
Merge over server-side bugfixes.
Eliminate extraneous dirty bits in sky settings.
2018-06-15 21:15:02 +01:00
34865c4bb5
Mods to hook up water settings to water normals for rendering with support for current to next blending.
...
Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings.
Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-06-13 00:51:39 +01:00
e2adba65de
Merge
2018-06-12 12:56:53 -07:00
2add1e7abd
Time threshold on timer based updates. Editor can replace frame with one from inventory. Extra check on adding a frame type.
2018-06-12 12:39:59 -07:00
fc8d0de673
Make cloud rendering use textures defined in sky settings and add code to shaders to lerp between current and next cloud texture.
2018-06-11 22:39:57 +01:00
8365945f8a
Settings inventory picker.
2018-06-08 16:40:01 -07:00
bff5049b92
Various editor fixes. Start adding a settings picker.
2018-06-06 17:10:58 -07:00
11a7c22b72
Merge
2018-06-05 16:39:11 +01:00
b06803225b
Reconnect apply to region and parcel reconnected to interface.
2018-06-04 16:50:13 -07:00
cd8f0da2d1
Fix use of new typedefs in inventory settings code in llenvironment.
2018-06-04 23:12:21 +01:00
7136956b90
Use more typedefs to simplify sync between viewer and sim env settings code.
2018-06-02 23:28:48 +01:00
7d6743f42d
Merge
2018-06-02 00:31:25 +01:00
2a613d7363
Rework preset loading and context menu from inventory.
2018-06-01 16:24:36 -07:00
8cfdc07e79
Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types.
2018-06-01 23:32:30 +01:00
c75eeab839
MAINT-8344 Day Cycle Editor (playing)
2018-05-23 19:01:52 +03:00
044b80e4e1
Manual blender for use in day editing dialog.
2018-05-22 10:49:55 -07:00
28d0fa0c69
MAINT-8344 Day cycle editor (part 2)
2018-05-16 20:25:42 +03:00
cef4e29b90
MAINT-8344 Day cycle editor (part 1)
2018-05-11 20:10:08 +03:00
15ce532ccf
Merge
2018-03-06 23:17:02 +00:00
cbe4cac78c
Settings type inventory objects and upload the assests.
2018-03-06 14:58:39 -08:00
Ansariel