Commit Graph

42641 Commits (acfbb41f4ddb59cd1fe0509949b7b1cf05ac4c9a)

Author SHA1 Message Date
Mnikolenko ProductEngine acfbb41f4d SL-13813 The current line is not selected after triple-clicking text in notecard on the macOS 2020-08-20 19:49:23 +03:00
Andrey Lihatskiy 275188a7e3 Merge branch 'master' into DRTVWR-503-maint 2020-08-18 19:10:46 +03:00
Nat Goodspeed e8b31d03b4 Increment viewer version to 6.4.8
following promotion of DRTVWR-501
2020-08-18 12:02:30 -04:00
Andrey Kleshchev 58ba75f6dd SL-13783 Workaround for enqueueCoprocedure() crash #2 2020-08-18 16:23:59 +03:00
Andrey Kleshchev fa0cc7b6d2 Merged in SL-13783 and SL-13789 2020-08-17 20:49:56 +00:00
Andrey Kleshchev 5ff63f0d7b SL-13789 Crash 'Enqueue failed' due to viewer requesting over 4K landmarks 2020-08-17 21:52:33 +03:00
Andrey Kleshchev 80fe2157fe SL-13783 Workaround for enqueueCoprocedure() crash with asset storage 2020-08-17 21:52:28 +03:00
Andrey Lihatskiy 9406b757a3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
#	indra/cmake/DirectX.cmake
#	indra/newview/llviewerparcelmedia.cpp
#	indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
Andrey Kleshchev 2e66c406d1 SL-13626 Renamed PoolSizeAssetStorage to PoolSizeVAssetStorage
to reflect previous commit and use correct pool size
2020-08-11 01:20:44 +03:00
Andrey Lihatskiy 6544826193 Merge branch 'master' into DRTVWR-501-maint 2020-08-10 23:59:32 +03:00
Nat Goodspeed 89cde15fb8 Increment viewer version to 6.4.7
following promotion of DRTVWR-476
2020-08-10 16:51:50 -04:00
Andrey Kleshchev 1935d25c78 Revert "SL-11215: Add release notes URLs to update-related notifications."
This reverts commit bf999f2f84 due to revert of updater, this will be moved to separate 'epic' instead
2020-08-06 20:06:02 +03:00
Andrey Kleshchev c27e207033 SL-13737 Crash when cleaning up uninitialized ndof device 2020-08-06 17:46:53 +03:00
Andrey Kleshchev 00acc562f9 Revert commit bbb16ff97c.
This fails at teamcity due to missing LLTrans, but builds locally without issues. Reverting to not hold D501
2020-08-05 22:36:00 +03:00
Andrey Kleshchev 59b9894d4c SL-13719 One more exit crash for asset storage 2020-08-05 20:07:19 +03:00
Andrey Kleshchev bbb16ff97c SL-13704 Move link generation into getReleaseNotes() 2020-08-05 20:07:19 +03:00
Andrey Lihatskiy 07c7506b1b Merge branch 'DRTVWR-476' into DRTVWR-501-maint 2020-08-05 09:59:41 +03:00
Andrey Lihatskiy af7ff3d99f Updated LLCA to codeticket build 546021 2020-08-03 13:42:08 +03:00
Andrey Kleshchev e8422ec9d7 SL-13626 Fixed spelling error 2020-07-31 00:14:14 +03:00
Andrey Kleshchev 135a85ec62 SL-13626 Fix asset storage coroutine shutdown 2020-07-30 21:07:35 +03:00
Andrey Kleshchev 8103d13047 SL-13704 Release notes link not loading in ToolsUpdate2 release 2020-07-30 14:43:27 +03:00
Andrey Kleshchev 6bafe47e5c Revert part of SL-11216 due to reverting VVM
This reverts commit 31d9930a0f.
2020-07-30 14:36:39 +03:00
Andrey Kleshchev a2b5f44b35 Merge branch 'DRTVWR-476' into DRTVWR-501-maint 2020-07-29 21:49:03 +03:00
Andrey Kleshchev 370a82b763 SL-13634 Don't warn about convex decomposition issues if it's a stub 2020-07-28 21:55:48 +03:00
Callum Prentice 24625c7898 Nat's suggested improvement to LLThreadSafeQueue that takes account of queue being empty as well as the status flag condition 2020-07-28 21:46:21 +03:00
Andrey Kleshchev 77f5a06a1e SL-13688 Reverted viewer-manager to pre-tools build 2020-07-27 20:33:52 +03:00
Andrey Kleshchev cca777fdf5 SL-13679 Event pump DupListenerName crash at login 2020-07-24 23:53:57 +03:00
Brad Payne (Vir Linden) b107e9218a no-op change to trigger rebuild 2020-07-24 21:46:49 +01:00
Brad Payne (Vir Linden) 0e62a92a7d no-op change to force new DRTVWR-476 build 2020-07-23 16:39:17 +01:00
Andrey Lihatskiy 3f48ab1c05 SL-13642 Get rid of that ugly ignore -Wdelete-incomplete
Get rid of that ugly '#pragma clang diagnostic ignored "-Wdelete-incomplete"' by making sure the delete always happens inside llview.cpp, where the type of LLView is known.
2020-07-23 00:46:20 +03:00
Andrey Lihatskiy cd6f7a4e6f Mac buildfix 2020-07-22 13:37:33 +03:00
Andrey Lihatskiy 1af3dfc0b3 SL-13642 Updated nghttp2, curl, googlemock, colladadom and boost
Updated nghttp2 to codeticket version 545354
Updated boost to codeticket version 545361
Updated colladadom to codeticket version 545362
Updated googlemock to codeticket version 545363
Updated curl to codeticket version 545369
2020-07-22 10:45:00 +03:00
Andrey Lihatskiy b17e2aaff1 SL-13642 Updated contributions.txt 2020-07-22 06:48:15 +03:00
Nicky Dasmijn fba9abbb19 Remove redundant LL_EXSTAT_ from enums. 2020-07-22 06:48:15 +03:00
Nicky Dasmijn 7d5a4d71ac Put hash for boost namespace properly into that by using namespace boost 2020-07-22 06:48:15 +03:00
Nicky Dasmijn acaa272330 LLExtStat had been a S32, this wasn't right, as some of the constants lead to integer overflow: const LLExtStat LL_EXSTAT_RES_RESULT = 2L<<30; const LLExtStat LL_EXSTAT_VFS_RESULT = 3L<<30; This shifts into the sign bit and clang gets (rightfully) upset about this.
LLExtStatus needs to be at least of type U32 to remedy this problem, but
while at it it makes sense to turn it into what it is: An enum. Turning
it into a class enum has the added benefit we get type safety for mostly
free.
Which incidentally turned up a problem right away:
A call to removeAndCallbackPendingDownloads had status and extstatus
reversed and thus was wrong.
2020-07-22 06:48:15 +03:00
Nicky Dasmijn c16a364377 There was an idiom to test with LL_DARWIN if the compiler used is clang. This is not correct, as clang is available on all 3 platforms. The correct way to check for this is via __clang__ (https://clang.llvm.org/docs/LanguageExtensions.html#builtin-macros) 2020-07-22 06:48:15 +03:00
Nicky Dasmijn 383e250fa6 Linux needs strcmp , include <string.h> so we get access to that function. 2020-07-22 06:48:15 +03:00
Andrey Lihatskiy 7bbf3f5f7f Merge branch 'master' into DRTVWR-501-maint
# Conflicts:
#	autobuild.xml
#	indra/newview/llimprocessing.cpp
2020-07-20 22:24:10 +03:00
Nat Goodspeed 72423372d6 Increment viewer version to 6.4.6
following promotion of DRTVWR-476
2020-07-20 15:04:30 -04:00
Brad Kittenbrink bbee0658c3 Fixed -Wstring-plus-int related errors for compatibility with Xcode-11.4 2020-07-14 19:53:57 +03:00
Andrey Kleshchev f554fe2ca7 SL-10326 Allow selecting any movable avatars with 'Allow Select Avatar' option 2020-07-10 23:51:39 +03:00
Andrey Kleshchev 55477e74c7 Reverted SL-12494
Change was moved to DRTVWR-514
2020-07-10 21:08:22 +03:00
Mnikolenko Productengine b495608a83 SL-12554 FIXED The value of the 'Avatar Maximum Complexity' is not synchronized after closing Advanced settings via Close btn 2020-07-09 18:07:57 +03:00
Andrey Kleshchev 85cbf2ee3b SL-12478 long names are not beautiful in Name Tags
According to revised behavior names should always fit into single line
2020-07-09 15:33:24 +03:00
Andrey Kleshchev ff2721823f SL-13579 Parcel media cannot be played if Media auto-play is set to No. 2020-07-09 00:42:44 +03:00
Nat Goodspeed 87da08b1f4 DRTVWR-476, SL-13555: Don't crash if user closes viewer during login.
Ever since February 2010, the body of the login coroutine function has been
enclosed in try/catch (...), with an llerrs message to try to crash more
informatively than the runtime's unhandled-exception termination. Over the
years this evolved to LL_ERRS and then to CRASH_ON_UNHANDLED_EXCEPTION.

This persisted despite the August 2016 addition of generic catch clauses in
the LLCoros::toplevel() function to serve the same purpose, and despite the
subsequent introduction of the LLCoros::Stop family of exceptions to
deliberately throw into waiting coroutines on viewer shutdown.

That's exactly what was happening. When the user closed the viewer while
waiting for the response from login.cgi, the waiting operation threw
LLCoros::Stopping, which was caught by that CRASH_ON_UNHANDLED_EXCEPTION,
which crashed the viewer with LL_ERRS rather than propagating up to the
toplevel() and cleanly terminating the coroutine.

Change CRASH_ON_UNHANDLED_EXCEPTION() to LOG_UNHANDLED_EXCEPTION() and
re-throw so toplevel() can handle.
2020-07-07 14:48:36 -04:00
Andrey Lihatskiy 4ac0ab2af3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 2020-07-06 21:48:11 +03:00
Andrey Kleshchev fa1ae9fa1a SL-13540 Fix line endings 2020-07-06 13:47:24 +03:00
Andrey Lihatskiy 3c564f5afc SL-11625 Fix for skewed baked texture offset values 2020-07-02 21:20:13 +03:00