summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-06Automated merge with tip of lindenlab/viewer64callum@lindenlab.com
2017-03-03Automated merge with headCallum Prentice
2017-03-03Remove OSX headers added for testing purposes and also some unused varsCallum Prentice
2017-03-03Pull in new version of p64_3p-dullahan with fix for missing OSX function and ↵callum@lindenlab.com
warnings
2017-03-03First pass at osx/macos keyboard events - simple case like google homepage ↵callum@lindenlab.com
is working
2017-03-01Fix up slight change to Dullahan interface where we call out the platform ↵callum@lindenlab.com
for native keyboard injection to match OSX version
2017-03-01Pull in new p64_3p-dullahan with osx keyboard input changescallum@lindenlab.com
2017-02-24First round of changes to make the macOS 64 build workcallum@lindenlab.com
2017-02-23Whoopps. Apologies for leaving Windows debug spam in code :(callum@lindenlab.com
2017-02-23Update media plugin CEF code to match new Dullahancallum@lindenlab.com
2017-02-23Pull in latest 3P Dullahan with change to cursor changed function signaturecallum@lindenlab.com
2017-02-22Use new version info from CEF plugin to display in About boxCallum Prentice
2017-02-22reenable support for copy/cut/paste to/from a web pageCallum Prentice
2017-02-22Pull in new version of p64_3p-Dullahan with support for flippyingh ↵Callum Prentice
pixels/mouse, copy/cut/paste and new version info
2017-02-22correct merge error in BuildVersion.cmakeOz Linden
2017-02-22use AUTOBUILD_BUILD_ID value for revision if available (requires autobuild ↵Oz Linden
1.1.4)
2017-02-21First round of changes to replace LLCEFLib with Dullahan. Mostly Windows ↵Callum Prentice
changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested
2017-02-21Add 3p Dullahan packages for windows 32/64 and darwin64Callum Prentice
2017-02-21Automated merge with head of lindenlab/viewer64callum@lindenlab.com
2017-02-21DRTVWR-418: At Oz's request, turn off HAVOK for Mac builds.Nat Goodspeed
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-17Automated merge with head of lindenlab/callum_viewer64callum@lindenlab.com
2017-02-15improve dependency declarations for packages-info and other settings filesOz Linden
2017-02-15MAINT-7130: suppress stdout from run_build_tests byOz Linden
converting to logging so that stdout from its command can be captured cleanly Make the default be to not print anything
2017-02-15convert run_build_tests to use argparse rather than optparseOz Linden
2017-02-13Automated merge with lindenlab/viewer64callum@lindenlab.com
2017-02-13DRTVWR-418: Fix syntax for previous test skip.Nat Goodspeed
2017-02-13Automated merge with lindenlab/viewer64callum@lindenlab.com
2017-02-13DRTVWR-418: Reluctantly skip llcorehttp 503-with-retry test on W64.Nat Goodspeed
2017-02-13Automated merge with ssh://bitbucket.org/lindenlab/nat_viewer64Nat Goodspeed
2017-02-13Automated merge with head of callum_linden/viewer64-xcode8callum@lindenlab.com
2017-02-13Automated merge with head of callum_linden/viewer64-callumcallum@lindenlab.com
2017-02-06DRTVWR-418: Update to KDU 7.9.502436Nat Goodspeed
2017-02-04DRTVWR-418: Merge from v-r makes llmath tests need Boost.Thread.Nat Goodspeed
2017-02-04DRTVWR-418: Finish cleaning up merge from viewer-release.Nat Goodspeed
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-02-03Change destination location of updated VLC files to correct onecallum@lindenlab.com
2017-02-03Automated merge with ssh://bitbucket.org/callum_linden/viewer64-xcode8Nat Goodspeed
2017-02-03DRTVWR-418: Remove most (all?) of the "stubs" from llurlentry_test.Nat Goodspeed
At some point the INTEGRATION_TEST_llurlentry build changed so that the library(ies) we attempted to stub out got linked in anyway, so that instead of simplifying the test, the stubs broke it with "duplicate symbol" errors. Commenting out the stubs permits the test program to succeed.
2017-02-03Automated merge with head of lindenlab/nat_viewer64callum@lindenlab.com
2017-02-03DRTVWR-418: Eliminate llui reference to newview's gSavedSettings.Nat Goodspeed
Instead, since gSavedSettings is an LLControlGroup and LLControlGroup derives from LLInstanceTracker, just look up the LLControlGroup with canonical name.
2017-02-03DRTVWR-418: INTEGRATION_TEST_llurlentry depends on Hunspell.Nat Goodspeed
2017-02-03DRTVWR-418: Make operator()() method for comparator functor const.Nat Goodspeed
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-02-02increment viewer version to 5.0.2Oz Linden
2017-02-02Added tag 5.0.1-release for changeset c9ce22950129Oz Linden
2017-01-30Automated merge with head of lindenlab/nat_viewer64Callum Linden
2017-01-30DRTVWR-418: Commit restoring -quiet switch for Xcode 8.Nat Goodspeed
2017-01-30DRTVWR-418: Backed out changeset f03df2b249d0: restore -quiet.Nat Goodspeed
As of now, this fork requires Xcode 8, which introduces support for the -quiet switch.
2017-01-30DRTVWR-418: Merge from oz_viewer64Nat Goodspeed
2017-01-27First batch of changes to add LibVLC media plugin to macOS viewer. Plugin ↵Callum Linden
fails to start because of an as-yet undiagnosed issue with VLC plugin files related to their extyended attributes