summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-31merge changes for 5.1.5-releaseOz Linden
2018-05-31increment viewer version to 5.1.6Oz Linden
2018-05-31Added tag 5.1.5-release for changeset 2ea47f358b17Oz Linden
2018-05-30remove unused UNATTENDED cmake variable that generates warningsOz Linden
2018-05-30set shell nullglob optionOz Linden
so that when a glob has no expansion you don't get the glob back ( *.sh expands to empty rather than to "*.sh")
2018-05-30always run testsOz Linden
2018-05-26Automated merge with ssh://bitbucket.org/lindenlab/viewer-bugsplatNat Goodspeed
2018-05-26SL-823: Fix typo in code that sets up BugSplat.Nat Goodspeed
2018-05-25SL-823: Fix minor compile errors in code to read build_data.json.Nat Goodspeed
2018-05-25SL-821: export BUGSPLAT_DB when loaded so child processes can detect.Nat Goodspeed
Produce CMake message when BugSplat is engaged so we can detect in build log. Don't try to copy BugSplat DLLs when NOT engaged.
2018-05-25SL-821, SL-826: Use BUGSPLAT_DB from environment on Windows and Mac.Nat Goodspeed
On TeamCity, set BUGSPLAT_DB from build-secrets. Use the presence of $BUGSPLAT_DB, rather than a new CMake BUGSPLAT option, to control whether CMake searches for BugSplat -- and passes LL_BUGSPLAT into C++. When BUGSPLAT_DB is present, make viewer_manifest.py set "BugSplat DB" in build_data.json, and "BugsplatServerURL" in Mac Info.plist. Make llappviewerwin32.cpp read "BugSplat DB" from build_data.json. Add placeholders for Mac hooks to suppress BugSplat prompt and send SecondLife.log.
2018-05-24Automated merge with ssh://bitbucket.org/nat_linden/maint-maint-8675Nat Goodspeed
2018-05-24MAINT-8675: In Darwin-specific CMake, use cp, not cmake -E copy.Nat Goodspeed
cmake -E copy does only one file at a time, and older CMake versions don't handle wildcards. But cmake -E copy is specifically for portability. When the copy operation itself is Darwin-only, we can count on having 'cp' available.
2018-05-24SL-821: Force the Mac -rpath linker switch using LINK_FLAGS propertyNat Goodspeed
instead of the INSTALL_RPATH CMake property, which _should_ have worked.
2018-05-23Automated merge with ssh://bitbucket.org/oz_linden/maint-8675Nat Goodspeed
2018-05-23fix tests broken by argument added to LLTrans::getStringOz Linden
2018-05-23MAINT-8675: update expired certs in integration testOz Linden
2018-05-23SL-821: Try again to add -rpath to Mac executable for BugSplat.Nat Goodspeed
2018-05-23SL-824: Update to bugsplat build 515662Nat Goodspeed
2018-05-23Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2018-05-23SL-824: Update to bugsplat build 515657Nat Goodspeed
2018-05-23SL-804, SL-821, SL-824: Merge Mac changes with Windows changesNat Goodspeed
2018-05-23SL-824: Update to bugsplat build 515654Nat Goodspeed
2018-05-22SL-821: Add macOS rpath to Mac viewer executable for BugsplatMac.Nat Goodspeed
The BugsplatMac framework is stamped with @rpath/BugsplatMac.framework/etc., so that's the dependency stamped into our viewer executable. To support that lookup, direct CMake to add an appropriate RPATH to the executable.
2018-05-22SL-821: Copy BugsplatMac.framework into target application bundle.Nat Goodspeed
2018-05-21SL-804, SL-824: Update to bugsplat build 515598Nat Goodspeed
2018-05-21SL-821: Need -fcxx-modules for C++ module support, vs. classic C.Nat Goodspeed
2018-05-21SL-821: Add -fmodules to llappdelegate-objc.mm compile switches.Nat Goodspeed
The BugsplatMac package is built as a module requiring @import. Using @import requires Objective-C++ module support, which requires the -fmodules switch.
2018-05-21SL-821: Use @import, not #import.Nat Goodspeed
2018-05-21SL-821: Merge changes for Windows platformNat Goodspeed
2018-05-21SL-821: Introduce macOS BugSplat initialization.Nat Goodspeed
2018-05-21SL-821: Reorder CMakeLists.txt includes to resolve interdependencies.Nat Goodspeed
2018-05-21Fix broken integration and unit tests.Graham Linden graham@lindenlab.com
Update KDU stubs in integration test. Work around MAINT-8675 stale cert in llsechandler_basic for now. Update stubs for LLTrans::getString in handful of integration tests.
2018-05-30Merged in oz_linden/maint-8675AndreyL ProductEngine
2018-05-18Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-05-17increment viewer version to 5.1.5Nat Goodspeed
2018-05-17Added tag 5.1.4-release for changeset 7b6b020fd5adNat Goodspeed
2018-05-17SL-821: Use classic-C BugSplat callback and static dumb pointer.Nat Goodspeed
BugSplat has no business introducing a new C++ API based on classic-C function pointers without even a generic pass-through user data pointer!
2018-05-17SL-821: Convert wstrings to strings of __wchar_t for BugSplat API.Nat Goodspeed
2018-05-17SL-821: Move Windows BugSplat engagement from llcommon to newview.Nat Goodspeed
Use WSTRINGIZE(), LL_TO_WSTRING(), wstringize() to produce required wide strings. Use a lambda for callback that sends log file; use LLDir, if set, to find the log file. Introduce BUGSPLAT CMake variable to allow suppressing BugSplat. Make BUGSPLAT CMake variable set LL_BUGSPLAT for C++ compilations. Set viewer version macros on llappviewerwin32.cpp, llappviewerlinux.cpp and llappdelegate-objc.mm -- because BugSplat needs the viewer version data, and because the macOS BugSplat hook is engaged in an Objective-C++ function we override in the app delegate.
2018-05-17SL-821: Merge LL_TO_WSTRING(), WSTRINGIZE() changes.Nat Goodspeed
2018-05-17SL-821: Add WSTRINGIZE() and DEWSTRINGIZE() macros for wide strings.Nat Goodspeed
Streamline convenience overload stringize(std::wstring); make convenience overload wstringize(std::string) symmetrically convert from UTF-8 string. Also eliminate STRINGIZE() et al. dependency on Boost.Phoenix: use lambdas instead. Using lambdas instead of template expansion necessitates reordering some code in wrapllerrs.h.
2018-05-17SL-821: Add LL_TO_WSTRING() macro to llpreprocessor.h.Nat Goodspeed
Also use existing LL_TO_STRING() macro to stringize LL_VIEWER_CHANNEL in llversioninfo.cpp and its tests.
2018-05-14Merged in ruslantproductengine/viewer-cougar-4cr-2 (pull request #10)Ruslan Teliuk
MAINT-8348 [LOVE ME RENDER] Edit Rotation Rings Occluded by Mesh Objects Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
2018-05-11SL-821: Use one self.path() call for everything under "llplugin".Nat Goodspeed
2018-05-11SL-821: Move BugSplat includes/libs from llcommon to newview.Nat Goodspeed
No C++ source in llcommon references any of the BugSplat code.
2018-05-10SL-821: Update to bugsplat build 515327Nat Goodspeed
2018-05-10MAINT-8348 [LOVE ME RENDER] Edit Rotation Rings Occluded by Mesh Objectsruslantproductengine
FIXED
2018-04-30MAINT-8610 Fixed GPU Benchmark appears to be broken - "Failed to allocate ↵AndreyL ProductEngine
buffer during benchmark"
2018-04-23MAINT-8574 Fixed Crash in LLVOVolume::markDead()AndreyL ProductEngine
+ null checks in LLVOVolume::setLightTextureID()
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 10:28:59 +0000