summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2016-12-07DRTVWR-418: Suppress llcorehttp tests until we solve TC harness issues.Nat Goodspeed
2016-12-07Automated merge with tip of lindenlab/oz_viewer64Callum Prentice
2016-12-07DRTVWR-418: Diagnostic prints to identify hangupNat Goodspeed
2016-12-07merge nats even newer fix for the llcorehttp testOz Linden
2016-12-07DRTVWR-418: Reinstate test that we THOUGHT was killing test run.Nat Goodspeed
But since the real problem is quite different, try with that suspected test restored.
2016-12-07DRTVWR-418: Fix a couple variable references in debugging output.Nat Goodspeed
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-06DRTVWR-418: Remove duplicate testrunner.pyNat Goodspeed
2016-12-06pick up latest fixes from natOz Linden
2016-12-06automated merge with tip of lindenlab/viewer64Callum Prentice
2016-12-06merge fix for test runner failureOz Linden
2016-12-06DRTVWR-418: Fix minor error in forwarding shutdown_request() call.Nat Goodspeed
2016-12-06Fix minor error in forwarding shutdown_request() call.Nat Goodspeed
2016-12-06Try even harder to ignore errors in llcorehttp's dummy server.Nat Goodspeed
2016-12-06DRTVWR-418: Try harder to ignore errors in llcorehttp's dummy server.Nat Goodspeed
2016-12-06merge with feature to skip the (failing on TC) llcorehttp testCallum Prentice
2016-12-06Merge with fix to run packages-formatterCallum Prentice
2016-12-06DRTVWR-418: Skip the whole of the failing llcorehttp test function.Nat Goodspeed
2016-12-06merge skip of llcorehttp failing testOz Linden
2016-12-06DRTVWR-418: Skip the llcorehttp test that breaks test machinery.Nat Goodspeed
Loath though I am to skip testing, this consistent failure is not a failure in the software being tested (llcorehttp) but rather in the dummy server with which we're testing it.
2016-12-06DRTVWR-418: Run packages-formatter via Python interpreter for Windows.Nat Goodspeed
2016-12-06merge changes for latest fixes from natOz Linden
2016-12-06DRTVWR-418: Remove ThreadingMixin from our HTTPServer subclass.Nat Goodspeed
It's possible that raising an exception in a worker thread -- even though we're TRYING to suppress it -- is what's causing the process to terminate with nonzero rc.
2016-12-06DRTVWR-418: Set AUTOBUILD_ADDRSIZE for packages-formatter.py.Nat Goodspeed
This handles the case of building within an IDE, in which AUTOBUILD_ADDRSIZE isn't already set.
2016-12-06Automated merge with tip of lindenlab/viewer64Callum Prentice
2016-12-06DRTVWR-418: Try to clean up numerous CMake CMP0046 warnings.Nat Goodspeed
2016-12-06DRTVWR-418: Try for more llcorehttp tests error diagnostics.Nat Goodspeed
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-05suppress VS linker warning about unfound pdb files in media pluginOz 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-05suppress VS linker warning about unfound pdb filesOz Linden
2016-12-05merge callum fixesOz Linden
2016-12-02Remove winmmshim 'hack' from project and set volume directly from CEF media ↵Callum Prentice
plugin using Windows system call. WinMMShim was only needed for XP systems and since we no longer support XP, it is not required.
2016-12-02show the build address size in the About boxOz Linden
2016-12-02add viewer channel and version to the beginning of the About box Licenses ↵Oz Linden
information
2016-12-01DRTVWR-418: Until we figure out how to say FIXED:NO to linker, don't.Nat Goodspeed
The present CMake logic wants to pass FIXED:NO to the linker for 64-bit builds, which on the face of it seems like a Good Thing: it permits code to be relocated in memory, preventing collisions if two libraries happen to want to load into overlapping address ranges. However the way it's being specified is wrong and harmful. Passing /FIXED:NO to the compiler command line engages /FI (Forced Include!) of a nonexistent file XED:NO -- producing lots of baffling fatal compile errors. Thanks Callum for diagnosing this!
2016-12-01DRTVWR-418: In 64 bits, storing size_t in an int is a no-no.Nat Goodspeed
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-30DRTVWR-418: VertexMap::mapped_type -> size_t: we store map.size().Nat Goodspeed
2016-11-30Pull in new version of KDU third party package that is build (correctly) as ↵Callum Prentice
a static library vs. a stub library/DLL
2016-11-30SL-540 - fix for regression in handling of out-of-range joint indices in ↵Brad Payne (Vir Linden)
skin weights
2016-11-30DRTVWR-418: Update forwarding_api.cpp to match current API signatureNat Goodspeed
Specifically, DriverCallback() was accepting several DWORD arguments that should really be DWORD_PTR arguments. In a 32-bit compile, evidently that was okay, but for 64 bits they're different sizes.
2016-11-29DRTVWR-418: Address yet another effect of downdating openjpeg.Nat Goodspeed
2016-11-28DRTVWR-418: Revert one more openjp2.dll reference to openjpeg.dll.Nat Goodspeed
2016-11-23DRTVWR-418: Work around missing LLCEFLibSettings::page_zoom_factor.Nat Goodspeed