Commit Graph

1277 Commits (0ff65651cc219eef959c5e961663de2a07595e5a)

Author SHA1 Message Date
Rider Linden f07dc421e8 Merge 2018-06-21 09:13:19 -07:00
Graham Linden 37e8fd20c3 Merge to 5.1.6 2018-06-01 15:34:21 +01:00
Rider Linden bd84cbfa11 Merge 2018-05-31 11:49:27 -07:00
andreykproductengine 9437d1511e merge from viewer-release 2018-06-01 01:18:47 +03:00
AndreyL ProductEngine 9ce455f84e DRTVWR-454 Update viewer-manager to codeticket version 515286 2018-05-09 21:38:36 +03:00
Graham Linden graham@lindenlab.com 0d7fa932d5 Move class3 sky/cloud shaders to where they need to be to get picked up by ALM.
Modify autobuild.xml to use new libatmo w/ state save/restore fixes (addresses font render glitch).

Put in nSight debug support.
2018-04-20 18:14:29 +01:00
Graham Linden graham@lindenlab.com 4129657cc0 Merge 2018-04-14 00:47:33 +01:00
Rider Linden 033b626959 Merge 2018-04-13 14:50:07 -07:00
Nat Goodspeed cca83567f1 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2018-04-13 15:30:22 -04:00
AndreyL ProductEngine 4c0af0891e Merged in lindenlab/viewer-release 2018-04-12 21:29:22 +03:00
callum_linden a90faaf970 Automated merge with https://bitbucket.org/nat_linden/viewer-maint-8397 to pick up debugging config changes 2018-03-22 12:37:17 -07:00
Nat Goodspeed 58a37513b8 MAINT-8397: Update viewer-manager to codeticket version 513570. 2018-03-21 17:26:19 -04:00
Nat Goodspeed 68f07f3d3e MAINT-8397: Update viewer-manager to codeticket version 513540. 2018-03-21 12:49:15 -04:00
Graham Linden graham@lindenlab.com 4ddae9b01b Update to KDU v7.A.4 rev 513518 for Mac fixes to unused but included app headers. 2018-03-21 17:33:19 +01:00
Graham Linden graham@lindenlab.com ee59a0a7fa Update KDU to v7.A.4 for all platforms. 2018-03-20 23:56:39 +01:00
Nat Goodspeed 991ed3bddc MAINT-8397: Update viewer-manager to codeticket version 513500. 2018-03-20 17:13:13 -04:00
Graham Linden graham@lindenlab.com 0ab3a4c63a Update KDU for Mac and Windows to v7.10.4 (aka 7.a.4) 2018-03-20 21:58:47 +01:00
callum_linden 9a293bc85f pull in new version of Dullahan (1.1.1080) built against CEF (3325.1750.gaabe4c4) and with the host process reaper enabled 2018-03-19 16:18:05 -07:00
callum_linden 5d76cba7c6 Update Dullahan CEF binaries to 3325.1749.ga42963a 2018-03-16 15:33:50 -07:00
callum_linden 6b4f4e53dd Pull in latest version of Dullahan (1.1.1072) and tweak media plugin code to match change in API 2018-03-15 16:12:52 -07:00
Graham Linden graham@lindenlab.com b1724bb13c Merge viewer-cougar 2018-03-09 00:41:27 +00:00
Graham Linden graham@lindenlab.com e7203d9a78 Update windows autobuild to fix ABI mismatch. 2018-03-08 23:45:05 +00:00
Graham Linden graham@lindenlab.com 84e47f45f6 Get libatmosphere shader into link chain for Adv WL shaders.
Point autobuild at fixed libatmosphere.
2018-03-08 22:26:31 +00:00
Rider Linden 7b56db31f9 Merge 2018-03-07 11:27:43 -08:00
Graham Linden graham@lindenlab.com 098d1c8ed6 Updated autobuild.xml to use update 3p-libatmosphere package w/ fixes for Release builds. 2018-03-06 20:59:29 +00:00
Graham Linden graham@lindenlab.com 1d522aca8a Reference updated libatmosphere package. 2018-03-06 19:20:52 +00:00
Graham Madarasz b9016f99f3 Merged lindenlab/viewer-cougar into default 2018-03-06 09:48:44 -08:00
Graham Linden graham@lindenlab.com 7ba03ede49 Modify use of linkable shader from libatmosphere.
Update to use latest 3p-libatmo build packages.
2018-03-06 17:42:54 +00:00
Graham Linden graham@lindenlab.com 56609e1186 Merge 2018-03-03 01:04:04 +00:00
Nat Goodspeed 3c7086d4ff Update to viewer-manager build 512994, updated for new viewer-release 2018-03-01 19:37:58 -05:00
callum_linden f4867d032d Automated merge with tip of viewer-release 2018-03-01 14:33:47 -08:00
Graham Linden graham@lindenlab.com f8134b152d Point at KDU 512987 w/ comment fix. 2018-03-01 22:23:13 +00:00
Graham Linden graham@lindenlab.com 45a7fa8e7a Point repo at KDU 512984 packages with fix for Windows knock-on from OSX fix. 2018-03-01 21:56:45 +00:00
Graham Linden graham@lindenlab.com c49748ad23 Point autobuild.xml at next round of KDU 64-bit compat fixes. 2018-03-01 20:54:02 +00:00
Graham Linden graham@lindenlab.com aa3522d287 Point viewer at KDU packages at rev 512968 with OSX fixes. 2018-03-01 19:44:46 +00:00
callum_linden 5f12e0e63d Pull in newer version of Dullahan (1.1.1050) that is built against newer version of CEF (3282.1741.gcd94615) 2018-03-01 09:33:23 -08:00
Graham Linden graham@lindenlab.com 2ade47ec86 Fix autobuild.xml to point to KDU 512941 packages. 2018-03-01 15:57:34 +00:00
AndreyL ProductEngine 723e0b2e6b Backed out changeset: a1a106a00e0b
due to OSX build issues
2018-03-01 17:29:48 +02:00
Graham Linden graham@lindenlab.com aba5777d74 Merge 2018-02-28 21:53:34 +00:00
Graham Linden graham@lindenlab.com 72270213f5 Add 3p package for adv atmospherics to autobuild.
Mark legacy atmospherics code with ifdefs.

Fix up legacy uplift to include new atmospherics settings.
2018-02-28 21:46:30 +00:00
AndreyL ProductEngine 8ee09ed28b MAINT-8200 Updated viewer-manager to codeticket version 512801.
Built from lindenlab/viewer-manager-maint
2018-02-22 22:19:01 +02:00
Graham Linden graham@lindenlab.com 6cc4a091b3 Add settings/validations for new advanced atmo settings. 2018-02-22 00:35:24 +00:00
Graham Linden graham@lindenlab.com 81611a9fbc Point autobuild at v7.A.3 version of KDU. 2018-02-20 21:51:16 +00:00
Graham Linden graham@lindenlab.com 99b82d9449 Atmospherics WIP
libatmosphere integrated in indra/llrender/llatmosphere.cpp

Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
2018-02-18 15:52:23 +00:00
callum_linden 08cb3fbe32 Automated merge with tip of viewer-release 2018-02-14 10:56:31 -08:00
callum_linden b2eb85df79 Speculative fix for MAINT-8250 Popups can appear in an unnamed new window external of the viewer. Note: This was a fix for a threading issue in Dullahan that caused clicking on links with target of 'new' to crash. I think it's the same issue here and manifests itself as CEF creating a new OS window. 2018-01-29 16:47:36 -08:00
callum_linden 8b09a997c5 Fixes for: MAINT-8244 Text in CEF cannot be selected with the mouse. MAINT-8245 Expose CEF log file and logging severity to viewer and MAINT-8246 Expose the CEF remote debugging system to the viewer 2018-01-26 17:06:19 -08:00
Nat Goodspeed cc2d66c3ec MAINT-8200: Update viewer-manager to codeticket version 512124. 2018-01-25 12:18:14 -05:00
Nat Goodspeed fc9fa1319c MAINT-8109: Update viewer-manager to codeticket version 512067. 2018-01-23 18:38:09 -05:00
callum_linden 8ee332fb10 Bring in the very latest version of Dullahan (1.1.1024) that matches the most recent canonical Dullahan and also bump the CEF plugin version in preparation for the RC build 2018-01-22 13:30:03 -08:00