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
c0e00cc617
merge changes for 5.1.5-release
2018-05-31 17:35:35 -04: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
71fa94b366
[MAINT-8693] - fix null check
2018-05-30 05:51:37 +05:30
0a36c8d3be
MAINT-8689 Potential crash fix
2018-06-07 20:10:24 +03:00
1fe32c16fb
Merged in lindenlab/viewer-bear
2018-06-02 02:18:57 +03:00
18bb3f6b86
MAINT-8712 Crash on close in LLWindowWin32
2018-06-01 13:51:03 +00:00
c767c906b2
MAINT-8714 Eliminate viewer duplicated ID nodes
2018-06-01 14:14:02 +03:00
9437d1511e
merge from viewer-release
2018-06-01 01:18:47 +03:00
b1f2b35079
MAINT-8702 FIXED Uploading any item results in opening previous Item Profile instead of Inventory Floater
2018-05-31 18:24:42 +03:00
f2113a037c
MAINT-8700 Remove obsolete code and update 'Save texture' file dialog
2018-05-31 14:59:31 +03:00
31bfc7ff47
MAINT-8700 FIXED The File dialog disconnects the viewer if you do not choose upload files within the first minute
2018-05-30 18:31:30 +03:00
e56be73dc6
merge changes for MAINT-8675
2018-05-29 11:50:14 -04:00
c18a4cb011
merge changes for 5.1.4-release
2018-05-29 11:49:46 -04:00
77344afa8b
additional debug logging for voice startup
2018-05-29 11:46:03 -04:00
177f24f56f
MAINT-8586 Eliminate obsolete xui elements
2018-05-29 17:26:10 +03:00
9e58cb266c
MAINT-8693 Fixed crashes during login if you wear a BOM tattoo layer
2018-05-25 21:11:54 +00:00
fadb6c7c65
MAINT-8459 Save favorite places and landmarks to Location Bar history list
2018-05-25 18:00:57 +03:00
86ffcca293
MAINT-8674 Fixed logs
2018-05-25 16:01:59 +03:00
c10f8b1aa4
MAINT-8674 Clean up already requested ids.
2018-05-25 12:34:14 +00:00
bcb5336958
Merged in andreyl_productengine/viewer-neko-marchcat (pull request #613 )
...
MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
2018-05-25 08:35:51 +00:00
a28a3b756d
MAINT-8694 FIXED Typo in logging
2018-05-25 11:32:15 +03: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
b3822148e1
merge Nat's fix for llcorehttp test
2018-05-24 16:25:14 -04:00
1892d7e5cf
Merged in nat_linden/maint-maint-8675
2018-05-24 23:13:15 +03:00
Graham Linden