Commit Graph

37264 Commits (f0b5a263c19477e66df1470c8ff5df6ee339f7f1)

Author SHA1 Message Date
Callum Prentice f0b5a263c1 Fixed for MAINT-7201, MAINT-7202, MAINT-7203 (viewer-embeddedd browser scheme handler was broken) 2017-03-14 15:28:56 -07:00
Callum Prentice c1f7c00869 SL-641 - Update CEF -> cef-bin -> Dullahan -> p64_3p-Dullahan -> media_plugin_cef.cpp to latest versionPull in p64_3p-dullahan that has the cef 2897/chrome 57 2017-03-14 12:40:25 -07:00
Callum Prentice 062c345556 Tweak CEF plugin version to include Chrome equivalent 2017-03-14 12:37:52 -07:00
Callum Prentice 9783350026 Automated merge with tip of viewer-release 2017-03-13 13:16:26 -07:00
Oz Linden 49e114748f increment viewer version to 5.0.4 2017-03-13 15:34:01 -04:00
Oz Linden 51a4af93b2 Added tag 5.0.3-release for changeset 02c24e9f4f7d 2017-03-13 15:34:01 -04:00
Callum Prentice 7c5e92cec5 SL-644 Add guard to mCount in LLRender.cpp 2017-03-13 11:13:43 -07:00
Callum Prentice 17c8eadb3d MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) by default. (Update2: evidently the registry set call is needed on un.init() too 2017-03-12 10:09:34 -07:00
Callum Prentice 656457e79b MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) by default. (Update: call to select registry needs to be inside a function) 2017-03-11 18:01:43 -08:00
callum@lindenlab.com 1053c5ca40 Update: (thanks Drake) MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) by default. Added option to engage 32 or 64 bit registry 2017-03-11 16:15:37 -08:00
Callum Prentice 10bcd510b5 MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) by default. 2017-03-10 15:11:44 -08:00
Callum Prentice 39ebb2d093 Fix for MAINT-7047 No information about 32bit or 64bit version of 'Project Alex Ivy' viewer in non-English locales 2017-03-10 12:20:13 -08:00
callum@lindenlab.com d1ef2a7291 Fix for SL-658 Use build settings from viewer-build-variables repo for p64_3p-dullahan 2017-03-09 17:16:21 -08:00
Callum Prentice 884a59a2fb Second part of fix for SL-646 Fix 'LINK : warning LNK4075: ignoring /INCREMENTAL due to '/LTCG' specification' in LibVLC, JPEGLIB etc. 2017-03-09 14:08:09 -08:00
callum@lindenlab.com fb85514cc8 Pull in 3rd party lib to fix: SL-646 ”LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/LTCG' specification” in LibVLC, JPEGLIB etc. 2017-03-09 12:17:14 -08:00
callum@lindenlab.com e6ed0b0ae7 Second Life SL-643 viewer_manifest.py still tried to copy the CEF file wow_helper.exe but it's no longer present 2017-03-08 14:29:02 -08:00
Oz Linden d6cd9d0771 merge changes for MAINT-7156 2017-03-08 15:32:05 -05:00
callum@lindenlab.com f8f2826156 Pull in updated p64_3p-dullahan with fix for help app icon appearing in dock 2017-03-06 16:00:24 -08:00
Nat Goodspeed 1771857e6c Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-03-06 14:27:29 -05:00
Oz Linden 08ed7f676f increment viewer version to 5.0.3 2017-03-06 14:25:25 -05:00
Oz Linden 885343edef Added tag 5.0.2-release for changeset cea1632c002c 2017-03-06 14:25:25 -05:00
callum@lindenlab.com bfdbda24bf Automated merge with tip of lindenlab/viewer64 2017-03-06 11:02:07 -08:00
Callum Prentice 9e00fe430d Automated merge with head 2017-03-03 17:45:33 -08:00
Callum Prentice 7d1942a2b6 Remove OSX headers added for testing purposes and also some unused vars 2017-03-03 17:45:09 -08:00
callum@lindenlab.com d056ce451b Pull in new version of p64_3p-dullahan with fix for missing OSX function and warnings 2017-03-03 16:41:11 -08:00
callum@lindenlab.com 398c351371 First pass at osx/macos keyboard events - simple case like google homepage is working 2017-03-03 15:32:47 -08:00
callum@lindenlab.com f49033efcf Fix up slight change to Dullahan interface where we call out the platform for native keyboard injection to match OSX version 2017-03-01 16:43:15 -08:00
callum@lindenlab.com 1243e41670 Pull in new p64_3p-dullahan with osx keyboard input changes 2017-03-01 16:42:21 -08:00
andreykproductengine 535f5c5120 MAINT-7161 Crash in LLViewerInventoryItem 2017-03-01 19:26:26 +02:00
callum@lindenlab.com 08940da90e First round of changes to make the macOS 64 build work 2017-02-24 15:44:36 -08:00
Oz Linden 94c2ebdea4 MAINT-7156: do not use the server-supplied agent email when sending a postcard because it is obfuscated and not needed 2017-02-24 14:20:48 -05:00
callum@lindenlab.com bff83a7f41 Whoopps. Apologies for leaving Windows debug spam in code :( 2017-02-23 10:26:46 -08:00
callum@lindenlab.com f04bfdd70e Update media plugin CEF code to match new Dullahan 2017-02-23 10:17:52 -08:00
callum@lindenlab.com 210e2a8bfb Pull in latest 3P Dullahan with change to cursor changed function signature 2017-02-23 10:16:47 -08:00
Callum Prentice 8f4cb2bc15 Use new version info from CEF plugin to display in About box 2017-02-22 19:22:15 -08:00
Callum Prentice 2c8299d643 reenable support for copy/cut/paste to/from a web page 2017-02-22 19:21:55 -08:00
Callum Prentice ea4ef0b4e0 Pull in new version of p64_3p-Dullahan with support for flippyingh pixels/mouse, copy/cut/paste and new version info 2017-02-22 19:21:01 -08:00
Oz Linden f0b256b1cb correct merge error in BuildVersion.cmake 2017-02-22 17:34:46 -05:00
Oz Linden f77af9df43 use AUTOBUILD_BUILD_ID value for revision if available (requires autobuild 1.1.4) 2017-02-22 17:03:00 -05:00
Callum Prentice 5534ab4e18 First round of changes to replace LLCEFLib with Dullahan. Mostly Windows changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested 2017-02-21 15:06:21 -08:00
Callum Prentice 8fd147f59d Add 3p Dullahan packages for windows 32/64 and darwin64 2017-02-21 10:25:55 -08:00
callum@lindenlab.com 135d96daca Automated merge with head of lindenlab/viewer64 2017-02-21 09:49:36 -08:00
Nat Goodspeed d18060e41c DRTVWR-418: At Oz's request, turn off HAVOK for Mac builds.
This is already done for TeamCity builds in build.sh, but since we don't yet
have 64-bit Xcode 8 Mac Havok working in the viewer, make plain developer
autobuild builds work also.
2017-02-21 12:15:47 -05:00
callum@lindenlab.com bf90329dea Automated merge with head of lindenlab/callum_viewer64 2017-02-17 09:43:08 -08:00
Oz Linden 9472098e81 improve dependency declarations for packages-info and other settings files 2017-02-15 15:27:05 -05:00
Oz Linden b6cdeb2271 MAINT-7130: suppress stdout from run_build_tests by
converting to logging so that stdout from its command can be captured
cleanly
Make the default be to not print anything
2017-02-15 13:00:20 -05:00
Oz Linden 83f2f43e36 convert run_build_tests to use argparse rather than optparse 2017-02-15 12:14:30 -05:00
callum@lindenlab.com c5ac455647 Automated merge with lindenlab/viewer64 2017-02-13 13:55:58 -08:00
Nat Goodspeed a0c1842595 DRTVWR-418: Fix syntax for previous test skip. 2017-02-13 16:53:18 -05:00
callum@lindenlab.com 189c043038 Automated merge with lindenlab/viewer64 2017-02-13 13:35:06 -08:00