diff options
author | Oz Linden <oz@lindenlab.com> | 2016-09-06 11:07:39 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-09-06 11:07:39 -0400 |
commit | 5edd4cecfc53b8287e1b3c6a22142bc72b8e0356 (patch) | |
tree | b5bed4e1e4279b88ae882d93264dc2234ecb81e8 /indra/llcommon/llcoros.cpp | |
parent | 8c86c594be7b7898ac6e622c505181cf5b000da6 (diff) | |
parent | 1804da89eea38615a4dd9532757b7ef7c35d2be6 (diff) |
merge changes for exception handling
Diffstat (limited to 'indra/llcommon/llcoros.cpp')
-rw-r--r-- | indra/llcommon/llcoros.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp index 5bbce4325b..8e516d8beb 100644 --- a/indra/llcommon/llcoros.cpp +++ b/indra/llcommon/llcoros.cpp @@ -38,6 +38,7 @@ #include "llevents.h" #include "llerror.h" #include "stringize.h" +#include "llexception.h" // do nothing, when we need nothing done void LLCoros::no_cleanup(CoroData*) {} @@ -235,7 +236,23 @@ void LLCoros::toplevel(coro::self& self, CoroData* data, const callable_t& calla // capture the 'self' param in CoroData data->mSelf = &self; // run the code the caller actually wants in the coroutine - callable(); + try + { + callable(); + } + catch (const LLContinueError&) + { + // Any uncaught exception derived from LLContinueError will be caught + // here and logged. This coroutine will terminate but the rest of the + // viewer will carry on. + LOG_UNHANDLED_EXCEPTION(STRINGIZE("coroutine " << data->mName)); + } + catch (...) + { + // Any OTHER kind of uncaught exception will cause the viewer to + // crash, hopefully informatively. + CRASH_ON_UNHANDLED_EXCEPTION(STRINGIZE("coroutine " << data->mName)); + } // This cleanup isn't perfectly symmetrical with the way we initially set // data->mPrev, but this is our last chance to reset mCurrentCoro. sCurrentCoro.reset(data->mPrev); |