8365945f8a
Settings inventory picker.
2018-06-08 16:40:01 -07:00
363f7f84a1
Validation fixes.
2018-06-07 10:24:29 -07:00
7f0c4cb989
Merge
2018-06-06 17:11:29 -07:00
bff5049b92
Various editor fixes. Start adding a settings picker.
2018-06-06 17:10:58 -07:00
caa5bd3cb9
Fix legacy haze validation returning warnings as errors.
...
Add assert that calculated spans are > 0 to avoid div by 0 NaNs.
Make span calc return 1.0 for case where begin == end.
Fix order of ops in LLTrackBlenderLoopingTime ctor causing skies to be init'd with water instances.
2018-06-06 19:48:12 +01:00
5b4eb9fb93
Back out change to fix pointer casts on OS X.
2018-06-05 20:40:17 +01:00
b6b9094d26
Fix sunlight != sunlight_color_copy and remove hack disable of clouds.
2018-06-05 20:20:43 +01:00
6b7f624a4b
Merge
2018-06-05 19:22:31 +01:00
610a793aa8
EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironment
2018-06-05 11:19:22 -07:00
197fbaa7f6
Speculative fix for Clang not making the semantic leap on ptr_t casts.
2018-06-05 18:24:48 +01:00
4b48ebdd34
Fix EOL on last line of llrender.cpp and llsettingssky.cpp
2018-06-05 18:17:54 +01:00
6ea2847b58
Fix uninit data from deleting c++11-style init and not putting it in the ctor.
...
Replace dynamic_pointer_cast so instance isn't accidentally deleted on func exit.
2018-06-05 17:58:09 +01:00
499993e3aa
Restore dropped header include and make constness match sim code.
2018-06-05 17:29:58 +01: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
38271e9980
Remove redundant typedef hosing OSX build.
2018-06-03 00:35:17 +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
f87cf83a2b
Mark LLSettingsSky::skipInterpolateKeys as override to silence Clang fail.
2018-06-01 23:54:01 +01: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
8dd8501386
Fix mis-merge of LLSettingsBase and remove optimize pragmas.
2018-06-01 15:50:25 +01:00
37e8fd20c3
Merge to 5.1.6
2018-06-01 15:34:21 +01:00
64302d3000
Modify use of sky settings, reduce complexity, and name funcs to indicate coord systems in use.
...
Fix class2 softenLightF shader.
2018-06-01 00:18:36 +01:00
bd84cbfa11
Merge
2018-05-31 11:49:27 -07:00
40d4e8b2e6
increment viewer version to 5.1.6
2018-05-31 14:32:43 -04:00
a51ce32598
Added tag 5.1.5-release for changeset 2ea47f358b17
2018-05-31 14:32:43 -04:00
460d944b08
More with min
2018-05-31 11:15:17 -07:00
9831087fb6
Use llmin rather than std::min
2018-05-31 10:36:10 -07:00
91f62d1c9c
Merge
2018-05-31 09:43:23 -07:00
2ddad24c4d
Timeline behavior in day cycle edit.
2018-05-30 17:08:28 -07:00
acaf57100e
switch track based on altitudes sent from region.
2018-05-24 17:09:01 -07:00
581869f2ca
Merge
2018-05-24 13:30:39 -07:00
fa4ac065cb
Enable sky changes with altitude.
2018-05-24 13:11:33 -07:00
ec8ee33939
MAINT-8675: In Darwin-specific CMake, use cp, not cmake -E copy.
...
cmake -E copy does only one file at a time, and older CMake versions don't
handle wildcards. But cmake -E copy is specifically for portability. When the
copy operation itself is Darwin-only, we can count on having 'cp' available.
2018-05-24 16:01:50 -04:00
c730ae22f8
fix tests broken by argument added to LLTrans::getString
2018-05-23 17:03:34 -04:00
fe8c976abe
MAINT-8675: update expired certs in integration test
2018-05-23 17:02:49 -04:00
fbaa01d9a0
Removed mSavedEnvironment so the Mac build will be happy.
2018-05-23 09:30:39 -07:00
c75eeab839
MAINT-8344 Day Cycle Editor (playing)
2018-05-23 19:01:52 +03:00
439273c9c1
Merge
2018-05-23 01:16:12 +01:00
b29aa01056
Enable save/load/import for day edit.
2018-05-22 16:54:04 -07:00
13536bb273
Remove some obsolete sky funcs.
...
Remove Matrix3/4 funcs using LLQuat 4-float init incorrectly
(they are redundant to angle/axis versions anyway).
Fix up tests referring to removed funcs above.
2018-05-22 21:42:54 +01:00
689beff669
Merge 5.1.5
2018-05-22 21:28:07 +01:00
3888de9439
Merge
2018-05-22 13:16:37 -07:00
656967b326
Merge PR
2018-05-22 13:08:35 -07:00
044b80e4e1
Manual blender for use in day editing dialog.
2018-05-22 10:49:55 -07:00
b6ba9dd565
MAINT-8344 Day Cycle Editor (part 4, finalization)
2018-05-22 20:32:56 +03:00
ae5f24eb4d
Make rendering of sun / moon work with both in the sky (test visibility independently).
2018-05-21 19:10:32 +01:00
f86073d609
Fix broken integration and unit tests.
...
Update KDU stubs in integration test.
Work around MAINT-8675 stale cert in llsechandler_basic for now.
Update stubs for LLTrans::getString in handful of integration tests.
2018-05-21 17:54:54 +01:00
Rider Linden