Commit Graph

183 Commits (430c8a766ec1e4b2df09cf2e6281f5eac7acd889)

Author SHA1 Message Date
Ansariel d927ba575a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llqueuedthread.h
#	indra/llcommon/lluuid.cpp
#	indra/llcommon/llworkerthread.cpp
#	indra/llimage/llimageworker.h
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewermenu.cpp
2023-05-17 21:40:54 +02:00
Ansariel 2c8130fd8d Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llsdserialize.h
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llviewermessage.cpp
#	indra/newview/skins/default/xui/de/floater_profile.xml
#	indra/newview/skins/default/xui/es/floater_profile.xml
#	indra/newview/skins/default/xui/fr/floater_profile.xml
#	indra/newview/skins/default/xui/it/floater_profile.xml
#	indra/newview/skins/default/xui/ja/floater_profile.xml
#	indra/newview/skins/default/xui/pt/floater_profile.xml
2023-02-10 10:49:36 +01:00
Andrey Kleshchev 8e03f926c7 SL-18970 Heavy name cache spam
If cap fails viewer can spam hundreds of "get legacy for agent" to logs which freezes it.
2023-02-09 01:06:16 +02:00
Ansariel 5a78473123 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/skins/default/xui/en/menu_viewer.xml
2022-09-16 11:23:28 +02:00
Ansariel c5d9c3c2a7 Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/cmake/Tracy.cmake
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llqueuedthread.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimagej2coj/llimagej2coj.cpp
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/llrender/llimagegl.cpp
#	indra/llrender/llimagegl.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable_mac.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
#	indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
2022-06-03 15:07:06 +02:00
Dave Parks b6841d75c2 SL-17219 WIP - Texture pipeline overhaul 2022-04-15 19:02:07 -05:00
Ansariel 0e90e53231 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-02-09 10:31:16 +01:00
Andrey Kleshchev 93805cfbc1 SL-16778 handle shutdown exceptions
These exceptions are expected and do not need to be logged
2022-02-07 22:50:37 +02:00
Ansariel 73bc62975e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-27 17:48:51 +01:00
Ansariel 6104c3aafc Now that Kokua yoinked Contact Sets, we can clean up some ugly dependencies... :P 2021-03-22 11:17:09 +01:00
Ansariel e4f0270887 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 11:41:48 +01:00
Beq 49039e66ea Avoid AvNameCache log spam for NULL UUID 2021-02-07 17:20:15 +00:00
Ansariel 7ca874a6e3 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2021-02-02 00:16:25 +01:00
Andrey Kleshchev 609a26b59a Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
# Conflicts:
#	autobuild.xml (llca)
#	indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
#	indra/newview/llscenemonitor.cpp (SL-14422)
#	indra/newview/llvovolume.cpp (SL-12069)
2021-02-01 22:28:15 +02:00
Andrey Kleshchev b36082170e SL-14767 Expanded logging to be a bit more informative 2021-01-28 23:30:27 +02:00
Andrey Kleshchev 0a2b748705 SL-14078 No point in verifying display name cap each frame #2 2020-10-12 19:40:22 +03:00
Andrey Kleshchev fc63aa7424 SL-14078 No point in verifying display name cap each frame
Convoluted due to multiple workarounds. Might be a good idea to spend some time refactoring this, but for now just trottled checks.
2020-10-09 21:53:53 +03:00
Ansariel 705b5568c4 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-07-24 23:49:28 +02:00
Andrey Lihatskiy ae48c7c8b3 Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
#	indra/llcommon/llerror.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llviewerjoystick.cpp
2020-07-21 11:54:11 +03:00
Nicky Dasmijn f116ea4cb7 Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
Ansariel 98129be5ef Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-06-17 15:45:05 +02:00
Kitty Barnett f747f34da4 Merge with RLVa (pre-EEP fix-up)
-> Gets a couple of large LL merges out of the way
2020-06-11 12:45:52 +02:00
Andrey Kleshchev 6fddbeb397 SL-12748 Blocked username displays old name after name change 2020-06-05 16:59:34 +03:00
Nat Goodspeed 2a56ab4436 DRTVWR-476, SL-12197: Don't throw Stopping from main coroutine.
The new LLCoros::Stop exception is intended to terminate long-lived coroutines
-- not interrupt mainstream shutdown processing. Only throw it on an
explicitly-launched coroutine.

Make LLCoros::getName() (used by the above test) static. As with other LLCoros
methods, it might be called after the LLCoros LLSingleton instance has been
deleted. Requiring the caller to call instance() implies a possible need to
also call wasDeleted(). Encapsulate that nuance into a static method instead.
2020-03-25 19:24:25 -04:00
Kitty Barnett 1ca7b29edf Merge branch 'appearance/misc' into rlva/development 2019-12-27 15:49:47 +01:00
Nicky 9335eded97 Merge with viewer-vs2107 2019-12-08 17:18:43 +01:00
Nat Goodspeed 95c6b512e1 DRTVWR-476, SL-12197: Don't throw Stopping from main coroutine.
The new LLCoros::Stop exception is intended to terminate long-lived coroutines
-- not interrupt mainstream shutdown processing. Only throw it on an
explicitly-launched coroutine.

Make LLCoros::getName() (used by the above test) static. As with other LLCoros
methods, it might be called after the LLCoros LLSingleton instance has been
deleted. Requiring the caller to call instance() implies a possible need to
also call wasDeleted(). Encapsulate that nuance into a static method instead.
2019-11-22 11:58:27 -05:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
andreykproductengine 779b5627c5 DRTVWR-493 LLAvatarNameCache to singletone 2019-07-03 20:06:47 +03:00
Kitty Barnett 60dc664802 Merged with default tip (Revision 241a5b4e3503)
--HG--
branch : RLVa
2018-07-20 13:50:30 +02:00
Kitty Barnett b98e2123a3 Merged with default tip (Revision 07528d0f9440)
--HG--
branch : RLVa
2018-03-29 11:11:20 +02:00
Ansariel bcb8dcee52 Merge viewer-neko 2018-03-13 19:48:24 +01:00
andreykproductengine 69d87dfb63 MAINT-8364 Fix for requestAvatarNameCache_ crash 2018-03-07 20:31:29 +02:00
Ansariel 25350b9422 Merge viewer-neko 2018-01-30 15:39:28 +01:00
andreykproductengine af8984348e MAINT-8210 Fixed crash in avatar name cache 2018-01-22 20:37:58 +02:00
andreykproductengine e6f5aa7f61 MAINT-8210 Fixed crash in avatar name cache 2018-01-22 20:37:58 +02:00
Kitty Barnett 3235691683 Merged with default tip (Revision bd9afd419b6a)
--HG--
branch : RLVa
2017-10-21 16:23:22 +02:00
Ansariel bff6a3af15 Merge viewer-neko 2017-02-23 09:02:58 +01:00
andreykproductengine 605160d501 MAINT-7118 Swapping legacy people API with new cache 2017-02-15 20:40:03 +02:00
Ansariel 83fef5c904 FIRE-20329: Contact Set aliases not displayed on first post 2016-11-08 00:24:45 +01:00
Kitty Barnett d0068b4a0c Merged with default tip (Revision 458d5e56948b)
--HG--
branch : RLVa
2016-10-15 21:32:03 +02:00
Kitty Barnett 0046a76489 Merged with default tip (Revision 353c4cb529e2)
--HG--
branch : RLVa
2016-10-03 22:39:14 +02:00
Nat Goodspeed 4d10172d8b MAINT-5011: Catch unhandled exceptions in LLCoros coroutines.
Wrap coroutine call in try/catch in top-level coroutine wrapper function
LLCoros::toplevel(). Distinguish exception classes derived from
LLContinueError (log and continue) from all others (crash with LL_ERRS).

Enhance CRASH_ON_UNHANDLED_EXCEPTIONS() and LOG_UNHANDLED_EXCEPTIONS() macros
to accept a context string to supplement the log message. This lets us replace
many places that called boost::current_exception_diagnostic_information() with
LOG_UNHANDLED_EXCEPTIONS() instead, since the explicit calls were mostly to
log supplemental information.

Provide supplemental information (coroutine name, function parameters) for
some of the previous LOG_UNHANDLED_EXCEPTIONS() calls. This information
duplicates LL_DEBUGS() information at the top of these functions, but in a
typical log file we wouldn't see the LL_DEBUGS() message.

Eliminate a few catch (std::exception e) clauses: the information we get from
boost::current_exception_diagnostic_information() in a catch (...) clause
makes it unnecessary to distinguish.

In a few cases, add a final 'throw;' to a catch (...) clause: having logged
the local context info, propagate the exception to be caught by higher-level
try/catch.

In a couple places, couldn't resist reconciling indentation within a
particular function: tabs where the rest of the function uses tabs, spaces
where the rest of the function uses spaces.

In LLLogin::Impl::loginCoro(), eliminate some confusing comments about an
array of rewritten URIs that date back to a long-deleted implementation.
2016-08-18 17:33:44 -04:00
Nat Goodspeed 993f54f6e9 MAINT-5011: Try to enrich catch (...) logging throughout viewer.
Turns out we have a surprising number of catch (...) clauses in the viewer
code base. If all we currently do is

    LL_ERRS() << "unknown exception" << LL_ENDL;

then call CRASH_ON_UNHANDLED_EXCEPTION() instead. If what we do is

    LL_WARNS() << "unknown exception" << LL_ENDL;

then call LOG_UNHANDLED_EXCEPTION() instead.

Since many places need LOG_UNHANDLED_EXCEPTION() and nobody catches
LLContinueError yet, eliminate LLContinueError& parameter from
LOG_UNHANDLED_EXCEPTION(). This permits us to use the same log message as
CRASH_ON_UNHANDLED_EXCEPTION(), just with a different severity level.

Where a catch (...) clause actually provides contextual information, or makes
an error string, add boost::current_exception_diagnostic_information() to try
to figure out actual exception class and message.
2016-08-17 15:40:03 -04:00
Nicky d7a0835432 Merge. 2016-09-26 21:12:34 +02:00
Ansariel 50a547919f FIRE-10635: Fix crash on settings restore introduced by coroutine merge 2016-06-22 21:35:20 +02:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00