summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2017-02-15improve dependency declarations for packages-info and other settings filesOz Linden
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat 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
2016-12-22one more try... also fixing setting of viewer_channel without quotesOz Linden
2016-12-22merge changes from project trunkOz Linden
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-21DRTVWR-418: Deal with fatal warning 'unsafe mix of bool and BOOL'Nat Goodspeed
2016-12-20DRTVWR-418: Avoid constructing symlink cycle for CEF framework.Nat Goodspeed
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-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.
2016-12-20DRTVWR-418: std::string::find() returns std::string::size_type.Nat Goodspeed
Storing it in a U32 and then comparing it to std::string::npos isn't going to work in 64 bit land.
2016-12-19DRTVWR-418: Avoid casting sa_sigaction to unsigned int for comparing.Nat Goodspeed
It's not really clear to me why the original coder felt it necessary to cast the two sigaction::sa_sigaction fields to unsigned int in the first place, but in a 64-bit clang compile, that discards information.
2016-12-16Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2016-12-16merge updates from natOz Linden
2016-12-13DRTVWR-418, BUG-41026: Double default coroutine stack size.Nat Goodspeed
Also make it Persist so if someone hand-edits it to try to find a more suitable size, they won't have to keep re-editing it for every session.
2016-12-09Merged in lindenlab/nat_viewer64 (pull request #6)nat_linden
DRTVWR-418: Change Mac build_directory to build-darwin-x86_64 since we no longer support 32-bit Mac builds.
2016-12-09increment minor version for p64 projectOz Linden
2016-12-09remove non-functional attempt to load llbase from the viewer tree; it is not ↵Oz Linden
there any more
2016-12-09move some cmake messages that are not warnings from stderr to stdoutOz Linden
2016-12-09Simplify version line in the About box, add address size to itOz Linden
2016-12-09add AUTOBUILD_ADDRSIZE to symbol file name for clarity, change output tag to ↵Oz Linden
just "Symbolfile"
2016-12-08DRTVWR-418: Change Mac build_directory to build-darwin-x86_64Nat Goodspeed
since we no longer support 32-bit Mac builds. The old build-darwin-i386 directory name appeared in a shocking number of files. Change CMake paths to use ${CMAKE_BINARY_DIR} -- or, when trying to find the packages subdirectory, ${AUTOBUILD_INSTALL_DIR}. Change the rest to at least look for build-darwin-*.
2016-12-07Automated merge with ssh://bitbucket.org/lindenlab/viewer-skip-llcorehttp-testNat Goodspeed
2016-12-07DRTVWR-418: Apparently (some) Windows hosts still need freeport().Nat Goodspeed
This is the function in indra/llmessage/tests/testrunner.py that iterates through ports in a specified range, looking for an available one. Other platforms understand a specification of port 0 to mean: "You pick one. I'll just use whichever one you picked."
2016-12-07Automated merge with tip of lindenlab/oz_viewer64Callum Prentice
2016-12-07merge nats even newer fix for the llcorehttp testOz Linden
2016-12-07DRTVWR-418: Revamp testrunner to shutdown server Thread at end.Nat Goodspeed
Instead of having testrunner.run()'s caller pass a Thread object on which to run the caller's server instance's serve_forever() method, just pass the server instance. testrunner.run() now constructs the Thread. This API change allows run() to also call shutdown() on the server instance when done, and then join() the Thread. The hope is that this will avoid the Python runtime forcing the process termination code to 1 due to forcibly killing the daemon thread still running serve_forever(). While at it, eliminate calls to testrunner.freeport() -- just make the runtime pick a suitable port instead.
2016-12-05Automated merge with lindenlab/viewer64 (itself, merged from viewer-release ↵Callum Prentice
after bento/5.0 release)
2016-12-05merge changes for 5.0.0-releaseOz Linden
2016-12-05Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-12-05update copying of fmodex{64}.dll to right place for 32/64 bit buildsCallum Prentice
2016-12-05increment viewer version to 5.0.1Oz Linden
2016-12-05lower the verbosity of makensis to emit only warnings and errorsOz Linden
2016-12-02show the build address size in the About boxOz Linden
2016-11-30DRTVWR-418: Adjust for LL_VIEWER_CHANNEL coming in unquoted.Nat Goodspeed
Evidently the LL_VIEWER_CHANNEL macro (defined on the compiler command line) used to contain enclosing double quotes. Something changed (newer CMake version?) so that the macro now expands as Second Life Release rather than as "Second Life Release". That leads to syntax errors when it's used. Add C++ preprocessor trickery to stringize the value of the macro.
2016-11-30DRTVWR-418: Flesh out the set of Platform_arch_Manifest classes.Nat Goodspeed
2016-11-30SL-540 - fix for regression in handling of out-of-range joint indices in ↵Brad Payne (Vir Linden)
skin weights
2016-11-17DRTVWR-418: Provide Darwin_i686_Manifest alias to Darwin_i386_Manifest.Nat Goodspeed
It's never been clear to me why Macs tend to refer to 32-bit Intel processors as i386 when other platforms tend to refer to them as i686. New CMake logic to derive ARCH from ADDRESS_SIZE produces i686. Give viewer_manifest.py a Darwin_i686_Manifest class alias so it continues to work when arch is passed as i686 as well as i386.
2016-11-16DRTVWR-418: pull in new viewer-release via viewer64Nat Goodspeed