summaryrefslogtreecommitdiff
path: root/indra
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 head of callum_linden/viewer64-xcode8callum@lindenlab.com
2017-02-13Automated merge with head of callum_linden/viewer64-callumcallum@lindenlab.com
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-01-30Automated merge with head of lindenlab/nat_viewer64Callum Linden
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-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: Harmless change to kick TeamCity build.Nat Goodspeed
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-22one more try... also fixing setting of viewer_channel without quotesOz Linden
2016-12-22merge changes from project trunkOz Linden
2016-12-21Automated merge with lindenlab/viewer64 and lindenlab/nat_viewer64Callum Prentice
2016-12-21DRTVWR-418: Use ensure_equals() on iffy lerp test to display values.Nat Goodspeed
2016-12-21DRTVWR-418: Fix a couple unused-variable fatal warnings in local builds.Nat Goodspeed
If the only use of a variable is within llassert(), have to make the declaration conditional on SHOW_ASSERT rather than guesswork about release builds.
2016-12-21Automated merge with head of lindenlab/nat_viewer64Callum Prentice
2016-12-21DRTVWR-418: Deal with fatal warning 'unsafe mix of bool and BOOL'Nat Goodspeed
2016-12-21DRTVWR-418: Harmless change to kick the TeamCity build.Nat Goodspeed
2016-12-20DRTVWR-418: Avoid constructing symlink cycle for CEF framework.Nat Goodspeed
2016-12-20DRTVWR-418 fix BOOL/bool comparison that errors out as as warning on VS 2013 ↵Callum Prentice
builds
2016-12-20don't add llcorehttp to all testsOz Linden
2016-12-20DRTVWR-418: Create CEF framework symlink from LLCefLib Helper.app.Nat Goodspeed
Without that symlink, the helper app can't find CEF and we get no web content.
2016-12-20DRTVWR-418: Make viewer_manifest.py copy current libexpat.1.dylib.Nat Goodspeed
2016-12-20DRTVWR-418: Fix libhunspell references to reflect current package.Nat Goodspeed
2016-12-20move debugging globals to the "lowest" library they are referenced inOz Linden
2016-12-20DRTVWR-418: Rationalize LLPipeline API.Nat Goodspeed
Someone evidently figured every static LLPipeline method should have at least one void* parameter. There were methods requiring void* parameters that were completely ignored. More to the point, there were methods whose callers have a U32 in hand -- and which want to use a U32 -- but which bizarrely forced callers to cast to void* just so the method could cast back to U32. In a 64-bit compile, this isn't merely pointless, it's erroneous. Change all such methods to accept U32; remove (void*) casts from call sites. While at it, fix LLPipeline API to use bool, true, false rather than their obsolete all-caps predecessors. Once you eat that first potato chip... :-P
2016-12-20DRTVWR-418: operator comparison methods should be const.Nat Goodspeed
clang has started to reject our non-const comparison operator methods used within standard algorithms.
2016-12-20DRTVWR-418: Another fix for std::string::find() return type.Nat Goodspeed
2016-12-20DRTVWR-418: Fix API for LLTracker::stopTracking().Nat Goodspeed
The signature for LLTracker::stopTracking() was silly: it accepted a void* for the sole purpose of testing whether it was NULL. In other words, the parameter was really a bool in void* clothing. Most callers passed NULL. What got ugly was when you wanted to pass 'true', or a variable bool value. Such values had to be cast to void*. In 64-bit land, the compiler correctly flags that as extremely dubious practice. But it's entirely unnecessary. Since stopTracking() wants a bool, change its parameter to bool. Everybody wins. (While at it, change a few related method params from BOOL to builtin bool.)
2016-12-20DRTVWR-418: Casting pointer to BOOL is just wrong.Nat Goodspeed
Since BOOL is simply a typedef for int, casting a 64-bit pointer to 32-bit int is correctly diagnosed by the compiler as an error. What works is to cast the pointer to (lowercase) bool, the builtin type, which engages the compiler's test for "is this pointer NULL?"
2016-12-20DRTVWR-418: Untangle LLWLParamKey, LLWLAnimator circularity.Nat Goodspeed
LLWLAnimator stores a std::map<F32, LLWLParamKey>. But llwlanimator.h only forward-declared LLWLParamKey, begging the question of how this ever compiled on any previous platform. LLWLParamKey was declared for real in llwlparammanager.h, so the obvious fix is to #include "llwlparammanager.h" in llwlanimator.h. Unfortunately this doesn't work because llwlparammanager.h already #includes "llwlanimator.h". As the dependency is specifically on LLWLParamKey, which isa LLEnvKey, which is declared in llenvmanager.h, move LLWLParamKey to llenvmanager.h. Then we can #include "llenvmanager.h" in llwlanimator.h instead of merely forward- declaring LLWLParamKey. This migration compiles LLWLParamKey in a context in which LLTrans isn't visible. It's not really clear why all LLWLParamKey's methods are inline, but toString() -- the method that requires LLTrans -- isn't going to be fast in any case. Break toString() out to llenvmanager.cpp, and #include "lltrans.h" there.