summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2017-01-19First set of changes to build (tests off) to build correctly against Xcode 8 ↵Callum Linden
and SDK 10.12
2017-01-10Automated merge with head of lindenlab/viewer64Callum Prentice
2017-01-06DRTVWR-418, SL-619: Update to google_breakpad build 501824Nat Goodspeed
and re-enable breakpad symbol generation.
2017-01-05DRTVWR-418, MAINT-7038: Don't add double quotes to channel name.Nat Goodspeed
The CMake directive that passes VIEWER_CHANNEL to the C++ compiler as LL_VIEWER_CHANNEL was enclosing the VIEWER_CHANNEL value in double quotes. At this point in history, those double quotes literally become part of the LL_VIEWER_CHANNEL value, causing the viewer to construct a bad Viewer Version Manager query containing those double quotes. Removing them fixes the query.
2017-01-04Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-01-04DRTVWR-418: Fix line-break problem; also explicitly request bash.Nat Goodspeed
2017-01-04DRTVWR-418: Set signing CMake switches in build.sh for proper quoting.Nat Goodspeed
2017-01-04DRTVWR-418: Harmless change to kick TeamCity build.Nat Goodspeed
2017-01-04DRTVWR-418: Consume autobuild_configure_parameters in build.sh.Nat Goodspeed
2017-01-03DRTVWR-418: Remove -DENABLE_SIGNING and -DSIGNING_IDENTITYNat Goodspeed
from autobuild.xml's darwin64 Release and ReleaseOS build (xcodebuild) command. -D passed to xcodebuild does NOT set CMake variables. These switches, in this place, have never worked as intended.
2017-01-03Automated merge with head of lindenlab/nat_viewer64Callum Prentice
2017-01-03Automated merge with head of lindenlab/viewer64Callum Prentice
2016-12-22DRTVWR-418: Emit less confusing error message when LL_BUILD not set.Nat Goodspeed
When LL_BUILD is not in the environment at autobuild configure time, important macros such as LL_WINDOWS aren't set. That means that platform-dependent macros such as LL_TYPEOF() aren't defined, which can produce obscure errors like this: indra\llcommon\llunittype.h(51): error C2226: syntax error : unexpected type 'S' (packages\llphysicsextensions\stub\LLPhysicsExtensionsStubImpl.cpp) 10> indra\llcommon\llunittype.h(52) : see reference to class template instantiation 'LLResultTypeAdd<S,T>' being compiled Make the CMake logic fail with a more readily-understood error in that case.
2016-12-22Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2016-12-22DRTVWR-418: If we don't produce a symbol file, don't try to upload it.Nat Goodspeed
2016-12-22one more try... also fixing setting of viewer_channel without quotesOz Linden
2016-12-22remove the xcodebuild -quiet because Xcode 7 doesn't do itOz Linden
2016-12-22merge trunk changesOz Linden
2016-12-22try again to actually fix the installer name function for Mac (and maybe Linux?)Oz Linden
2016-12-22merge changes from project trunkOz Linden
2016-12-22fix installer name function for Mac (and maybe Linux?)Oz Linden
2016-12-21DRTVWR-418: Migrate HAVOK suppression from autobuild.xml to build.sh.Nat Goodspeed
Turns out that without HAVOK, we can't build the PhysicsExtensions_TPV; but the viewer's build.sh is unaware of CMake switches set in autobuild.xml. Passing those CMake overrides in build.sh allows us to test that setting elsewhere in build.sh to skip the PhysicsExtensions_TPV step -- instead of failing the build.
2016-12-21DRTVWR-418: Temporarily disable Mac generate_breakpad_symbols.py.Nat Goodspeed
2016-12-21try using xcodebuild -quietOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 08:56:02 +0000