5b4dba2cea
Merge
2018-10-03 17:16:15 +01:00
ac184e1ca7
Merged in graham_linden/viewer-eep-graham (pull request #125 )
...
SL-9687
2018-10-02 16:32:06 +00:00
05d3d1b481
Add LUT textures and optional settings for moisture/ice level to sky settings.
2018-10-02 17:00:17 +01:00
17ce10ccd9
SL-9687
...
Make WL sky updates only update the env map (the only map used when WL shaders are in effect)
to reduce the cost of generating sky textures.
Update of env map only is 6ms where sky + env map is 14+ms.
2018-10-02 15:43:03 +01:00
06e83caa26
SL-9778 EEP It's possible to open more then one My Environments floater
2018-10-02 15:36:55 +03:00
c6e414009a
Merge
2018-10-01 17:13:27 -07:00
c6b4b81bf2
Merged in graham_linden/viewer-eep-graham (pull request #123 )
...
SL-9775
2018-10-02 00:12:47 +00:00
b4d6611ea7
SL-9775
...
Add LLPointer<> on stack to avoid textures being deleted out from under the sky code.
Make textures used by sky settings remove their faces from media textures.
Add ability to detect when a given texture is viewer media with vfunc.
2018-10-02 00:57:32 +01:00
83c2692ffc
Hide altitudes on legacy regions
2018-10-01 16:49:44 -07:00
fdfb60ecb1
Merge
2018-10-01 16:12:48 -07:00
6e7d794b01
MAINT-9738: Wire the altitude slider to the protocol and send new altitudes to simulator.
2018-10-01 16:10:19 -07:00
c98522a40e
Merge
2018-10-01 22:52:37 +01:00
1d94f7e9eb
Merged in graham_linden/viewer-eep-graham (pull request #122 )
...
SL-1655
2018-10-01 16:21:16 +00:00
c4941fc182
Merge
2018-10-01 17:17:29 +01:00
ae099c639f
SL-1655
...
Make water horizon consistent between ALM and non-ALM rendering again.
Fix using deferred sky rendering in reflections.
Make matrix mode explicit around push/pop for safety.
2018-10-01 17:16:58 +01:00
59a4a215de
Merged in andreykproductengine/maint-eep (pull request #121 )
...
SL-9755 EEP Cannot apply a new Sky setting to the parcel.
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
2018-10-01 16:15:34 +00:00
100fd88d2c
SL-9755 EEP Cannot apply a new Sky setting to the parcel.
2018-10-01 16:46:16 +03:00
50ec228b02
SL-9660 EEP Remove residual code (LLFloaterEditDayCycle and LLEnvironment::UserPrefs)
2018-10-01 16:45:19 +03:00
ee2720d0a1
Merged in andreykproductengine/maint-eep (pull request #118 )
...
SL-9762 Fixed EEP Several Day Cycle UI bits are movable
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
2018-09-28 16:36:16 +00:00
6401ed2298
SL-9620 FIXED Viewer crashes after clicking "Commit" button while editing Day Cycle preset
2018-09-28 15:56:48 +03:00
171cb51957
SL-9762 Fixed EEP Several Day Cycle UI bits are movable
2018-09-28 15:24:13 +03:00
a309d30554
SL-9752 The ’Show Empty Folders’ option is displayed over the lower scroll bar
2018-09-27 20:38:12 +03:00
7597e4ecfd
Merge
2018-09-27 10:14:09 -07:00
337beb56f9
Flipped the wrong return value. Fixed the conditional.
2018-09-27 10:13:42 -07:00
3cfeff4bb3
SL-9755 EEP Cannot apply a new Sky setting to the parcel.
2018-09-27 19:09:21 +03:00
b328c7384e
SL-9679: Record the asset id that the editor is expecting. If none set to null. If asset id recieved does not match expected throw it away.
2018-09-26 16:54:01 -07:00
78866b33a9
Merge
2018-09-26 13:46:45 -07:00
58aef8beaf
increment viewer version to 5.1.10
2018-09-26 16:12:20 -04:00
e213eafca9
Added tag 5.1.9-release for changeset 52422540bfe5
2018-09-26 16:12:19 -04:00
2d5fa7a732
SL-1825 EEP - default description should be empty
2018-09-26 20:33:26 +03:00
2c25b7dcc3
Merged in andreykproductengine/maint-eep2 (pull request #115 )
...
SL-983 EEP - When selecting a new parcel with the day editor open follow in editor
2018-09-26 16:45:20 +00:00
41a6504c5e
SL-983 EEP - When selecting a new parcel with the day editor open follow in editor
2018-09-26 18:14:44 +03:00
405f5c879c
SL-9732 FIXED [EEP] Save As does not provide dialogue to supply new setting name
2018-09-26 17:39:55 +03:00
cca55533f8
Merged in graham_linden/viewer-eep-graham (pull request #112 )
...
SL-9711, SL-1505, SL-9708
2018-09-25 22:47:41 +00:00
2a1a7396b2
Fix slider max to 168
2018-09-25 15:12:46 -07:00
3778dd4085
SL-1505 and SL-9608
...
Get both reflections and clip plane bugs fixed (at the same damn time).
2018-09-25 22:20:07 +01:00
1cef57ef81
Merge
2018-09-25 13:25:26 -07:00
18dd6f076e
SL-1961 EEP Altitude labels auto-adjustment
2018-09-25 20:27:59 +03:00
ed2e333a54
MAINT-9734: Change limits on settings values.
2018-09-24 17:00:01 -07:00
70c18ba14b
SL-9736: 0.0 is no motion for cloud scroll.
2018-09-24 14:55:21 -07:00
5969609c47
Merge
2018-09-24 19:53:50 +01:00
501cd7d902
SL-9711 modify clamping range on atmospheric additive color to balance between maintaining old look of WL settings and fixing SL1491 lens flare bug
2018-09-24 19:50:08 +01:00
e5a8fb042a
SL-9708
...
Fix knock-on from fix for SL1505 reflection matrix bug by putting back old code for setting up underwater culling planes.
Fix some diffs from viewer-release.
2018-09-24 19:14:41 +01:00
c1974bf10a
Merged in andreykproductengine/maint-eep (pull request #109 )
...
SL-1817 and SL-9677
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
2018-09-24 15:59:04 +00:00
6bff7d786e
Merged in andreyl_productengine/viewer-eep-marchcat (pull request #108 )
...
SL-1546 + line endings fix
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
2018-09-24 15:57:56 +00:00
6e0481b604
SL-9677 EEP Small adjustment to error message for not applying enviroment setting
2018-09-24 18:54:54 +03:00
f0eb06ed13
SL-1546 VitrualTrackBall - Reduced the angle change per button click to 1deg
2018-09-24 18:24:32 +03:00
ee532d946d
SL-1817 EEP Day Cycle timeline scrubber can't be repositioned while it's playing
2018-09-24 18:00:01 +03:00
46481b25cd
line endings fix
2018-09-24 17:44:32 +03:00
92dc9ceb83
SL-9676 EEP Pick:SELECT SETTINGS limit folder operations options
2018-09-24 16:36:01 +03:00
Graham Linden