livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,600 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

38600 Commits (d2fa5a53e8b91bd0aba10ab3917c722dc360b610)

Author SHA1 Message Date
Oz Linden d2fa5a53e8 remove unused UNATTENDED cmake variable that generates warnings 2018-05-30 13:14:43 -04:00
Oz Linden 837ca22924 set shell nullglob option 
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-30 10:36:23 -04:00
Oz Linden 0fedc97f3f always run tests 2018-05-30 10:32:47 -04:00
Nat Goodspeed 6b17202a07 Automated merge with ssh://bitbucket.org/lindenlab/viewer-bugsplat 2018-05-26 08:45:19 -04:00
Nat Goodspeed a5c17472fb SL-823: Fix typo in code that sets up BugSplat. 2018-05-26 08:44:57 -04:00
Nat Goodspeed 3ca76065b0 SL-823: Fix minor compile errors in code to read build_data.json. 2018-05-25 19:02:53 -04:00
Nat Goodspeed 8781b36d7e SL-821: export BUGSPLAT_DB when loaded so child processes can detect. 
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-25 16:08:00 -04:00
Nat Goodspeed 63fe7d802a SL-821, SL-826: Use BUGSPLAT_DB from environment on Windows and Mac. 
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-25 12:09:50 -04:00
Nat Goodspeed 0ebdfaa5fc Automated merge with ssh://bitbucket.org/nat_linden/maint-maint-8675 2018-05-24 16:07:29 -04:00
Nat Goodspeed ec8ee33939 MAINT-8675: In Darwin-specific CMake, use cp, not cmake -E copy. 
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-24 16:01:50 -04:00
Nat Goodspeed b247c4e424 SL-821: Force the Mac -rpath linker switch using LINK_FLAGS property 
instead of the INSTALL_RPATH CMake property, which _should_ have worked.
 2018-05-24 08:48:00 -04:00
Nat Goodspeed c665a05b78 Automated merge with ssh://bitbucket.org/oz_linden/maint-8675 2018-05-23 17:10:08 -04:00
Oz Linden c730ae22f8 fix tests broken by argument added to LLTrans::getString 2018-05-23 17:03:34 -04:00
Oz Linden fe8c976abe MAINT-8675: update expired certs in integration test 2018-05-23 17:02:49 -04:00
Nat Goodspeed 43716d5800 SL-821: Try again to add -rpath to Mac executable for BugSplat. 2018-05-23 15:48:58 -04:00
Nat Goodspeed 07ebe236a1 SL-824: Update to bugsplat build 515662 2018-05-23 11:31:13 -04:00
Nat Goodspeed f42929db2a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2018-05-23 11:19:53 -04:00
Nat Goodspeed 78dbccf14a SL-824: Update to bugsplat build 515657 2018-05-23 06:42:23 -04:00
Nat Goodspeed 46e9433ec7 SL-804, SL-821, SL-824: Merge Mac changes with Windows changes 2018-05-23 04:55:16 -04:00
Nat Goodspeed 96dfab228e SL-824: Update to bugsplat build 515654 2018-05-23 04:54:09 -04:00
Nat Goodspeed 48534c1bad SL-821: Add macOS rpath to Mac viewer executable for BugsplatMac. 
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-22 12:00:20 -04:00
Nat Goodspeed 199c688e21 SL-821: Copy BugsplatMac.framework into target application bundle. 2018-05-22 11:52:00 -04:00
Nat Goodspeed 670943de5a SL-804, SL-824: Update to bugsplat build 515598 2018-05-21 15:02:17 -04:00
Nat Goodspeed 170d5201ff SL-821: Need -fcxx-modules for C++ module support, vs. classic C. 2018-05-21 14:13:11 -04:00
Nat Goodspeed 6f878571ec SL-821: Add -fmodules to llappdelegate-objc.mm compile switches. 
The BugsplatMac package is built as a module requiring @import. Using @import
requires Objective-C++ module support, which requires the -fmodules switch.
 2018-05-21 13:54:39 -04:00
Nat Goodspeed 3a885e9cb7 SL-821: Use @import, not #import. 2018-05-21 13:29:16 -04:00
Nat Goodspeed cabcb299d5 SL-821: Merge changes for Windows platform 2018-05-21 13:09:13 -04:00
Nat Goodspeed 881bdec4b3 SL-821: Introduce macOS BugSplat initialization. 2018-05-21 13:07:44 -04:00
Nat Goodspeed 4562773abc SL-821: Reorder CMakeLists.txt includes to resolve interdependencies. 2018-05-21 13:03:43 -04:00
Nat Goodspeed c70119ebab increment viewer version to 5.1.5 2018-05-17 19:30:17 -04:00
Nat Goodspeed 5f5bf0eaf1 Added tag 5.1.4-release for changeset 7b6b020fd5ad 2018-05-17 19:30:16 -04:00
Nat Goodspeed 800b47ec23 SL-821: Use classic-C BugSplat callback and static dumb pointer. 
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-17 15:02:26 -04:00
Nat Goodspeed cd21556aef SL-821: Convert wstrings to strings of __wchar_t for BugSplat API. 2018-05-17 10:58:59 -04:00
Nat Goodspeed c5f618d096 SL-821: Move Windows BugSplat engagement from llcommon to newview. 
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-17 06:53:42 -04:00
Nat Goodspeed c45fc5a381 SL-821: Merge LL_TO_WSTRING(), WSTRINGIZE() changes. 2018-05-17 06:15:41 -04:00
Nat Goodspeed c09d9c12e7 SL-821: Add WSTRINGIZE() and DEWSTRINGIZE() macros for wide strings. 
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-17 05:45:36 -04:00
Nat Goodspeed ed891c60de SL-821: Add LL_TO_WSTRING() macro to llpreprocessor.h. 
Also use existing LL_TO_STRING() macro to stringize LL_VIEWER_CHANNEL in
llversioninfo.cpp and its tests.
 2018-05-17 05:33:14 -04:00
Nat Goodspeed 78b8a0c3e4 SL-821: Use one self.path() call for everything under "llplugin". 2018-05-11 17:04:24 -04:00
Nat Goodspeed 3de5bab174 SL-821: Move BugSplat includes/libs from llcommon to newview. 
No C++ source in llcommon references any of the BugSplat code.
 2018-05-11 16:00:20 -04:00
Nat Goodspeed 2fb39cb45f SL-821: Update to bugsplat build 515327 2018-05-10 15:05:55 -04:00
AndreyL ProductEngine a1934bee39 MAINT-8610 Fixed GPU Benchmark appears to be broken - "Failed to allocate buffer during benchmark" 2018-04-30 20:23:57 +03:00
AndreyL ProductEngine 7ce880150f MAINT-8574 Fixed Crash in LLVOVolume::markDead() 
+ null checks in LLVOVolume::setLightTextureID()
 2018-04-23 23:31:23 +03:00
eli 2b8c56856b FIX INTL-282 minor translation issue, German 2018-04-23 16:21:20 -07:00
eli 3856d02b35 FIX INTL-282 minor translation issue 2018-04-19 15:47:09 -07:00
callum_linden 6c953d0bde Automated merge with tip of viewer-release after Viewer Media Update release 2018-04-12 15:22:25 -07:00
AndreyL ProductEngine 8c67f588da Merged in lindenlab/viewer-release 2018-04-12 21:22:22 +03:00
Oz Linden 41f4e85473 merge MAINT-8474 changes 2018-04-12 14:19:56 -04:00
Oz Linden ff6afbd376 increment viewer version to 5.1.4 2018-04-12 14:16:27 -04:00
Oz Linden 4de1a21850 Added tag 5.1.3-release for changeset 7c00e5b6cb3d 2018-04-12 14:16:26 -04:00
Andrey Kleshchev b5d72cf657 MAINT-8203 Restore legacy name lookup 2018-04-06 14:15:11 +00:00