Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
maxim_productengine 3c12c7ce56 MAINT-8619 Disable local textures for selection in Group profile 2018-05-23 11:58:42 +03: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
Ruslan Teliuk 32b07b5a6f Merged in ruslantproductengine/viewer-neko-4cr-4 (pull request #607)
MAINT-8670 Crash in: LLFace::getGeometryVolume()

Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: Simon Linden <simon@lindenlab.com>
2018-05-22 15:22:17 +00:00
ruslantproductengine d35a8fcb3f MAINT-8670 Crash in: LLFace::getGeometryVolume()
Guarded.
2018-05-22 18:18:57 +03:00
Andrey Kleshchev 9411bd1cef MAINT-2338 Unit tests 2018-05-22 12:58:52 +00:00
maxim_productengine 250a0396ac MAINT-8635 Don't allow using 'close all windows' if modal toast is open 2018-05-22 14:24:09 +03:00
maxim_productengine 7fc86d1a99 MAINT-8553 FIXED link is not copied from original folder in some cases 2018-05-22 13:42:15 +03:00
Anchor Linden 0fdbe7e34d Merge 2018-05-21 16:47:42 -07:00
Anchor Linden 3bf89821d9 [DRTVWR-455] - added 5 new bake channels 2018-05-21 16:00:52 -07: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
Graham Linden graham@lindenlab.com f86073d609 Fix broken integration and unit tests.
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-21 17:54:54 +01:00
AndreyL ProductEngine 734ce6110f Merged in oz_linden/maint-8675 2018-05-30 06:39:50 +03:00
maxim_productengine 126f9c3e1a SL-857 Remove "Create Auction" functionality from viewer 2018-05-21 18:41:33 +03:00
Graham Linden graham@lindenlab.com c0413250b7 Merge 5.1.5 2018-05-18 19:25:54 +01:00
maxim_productengine 0bd55476ac MAINT-8669 Add callback to show appropriate friendship menu option 2018-05-18 15:56:40 +03:00
AndreyL ProductEngine 64b3473f49 Merged in lindenlab/viewer-release 2018-05-18 03:02:44 +03:00
AndreyL ProductEngine 5493d4d5c7 Merged in lindenlab/viewer-lynx 2018-05-18 02:56:00 +03:00
AndreyL ProductEngine c9bb75e335 MAINT-7626 EOF fix 2018-05-18 02:51:09 +03:00
AndreyL ProductEngine bbbcd6102a Merge 2018-05-18 02:51:57 +03: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
AndreyL ProductEngine 99d9befb62 MAINT-8524 Estate Access Management - Viewer side changes for the "Banned" list 2018-05-18 00:21:39 +03: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
maxim_productengine c9fed71e60 MAINT-8649 FIXED CTRL+ALT+T does not make alpha masking textures visible 2018-05-17 18:12:04 +03:00
Andrey Kleshchev 398a5d4ddb MAINT-8479 When facing object we should ignore movement distance threshold 2018-05-17 15:05:18 +00: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
AndreyL ProductEngine b29c7173c6 MAINT-8581 Better handling of adding Estate Managers to Banned list 2018-05-16 23:50:57 +03:00
AndreyL ProductEngine 30df194a0a MAINT-8592 EstateAccess capability support #2 2018-05-16 19:07:41 +03:00
Graham Linden graham@lindenlab.com 5654137955 Merge 2018-05-15 22:35:42 +01:00
maxim_productengine 7a2e3dd1bc MAINT-8611 Prevent object media updates if media preference is disabled 2018-05-14 18:24:01 +03:00
Ruslan Teliuk 151df9b87b Merged in ruslantproductengine/viewer-cougar-4cr-2 (pull request #10)
MAINT-8348 [LOVE ME RENDER] Edit Rotation Rings Occluded by Mesh Objects

Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
2018-05-14 12:43:58 +00:00
andreykproductengine 83dcf6b10d MAINT-8689 Diagnostics for coroutine memory crash 2018-05-14 14:07:36 +03:00
Mnikolenko ProductEngine f77de22d4d network test fixes2 2018-06-13 18:44:37 +03:00
Mnikolenko ProductEngine f17668cc77 network test fixes 2018-06-13 16:56:13 +03:00
Mnikolenko ProductEngine 39525a4d48 build fix 2018-06-13 15:05:00 +03:00
maxim_productengine e30164ef64 MAINT-8745 Use HTTPS splash screen in viewer 2018-06-13 14:24:28 +03:00
maxim_productengine 1a014427a2 MAINT-8727 FIXED Saving snapshot will cause disconnect if you do not choose path in File picker quickly 2018-06-12 17:45:55 +03:00