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/llleap.cpp | |
| parent | 8c86c594be7b7898ac6e622c505181cf5b000da6 (diff) | |
| parent | 1804da89eea38615a4dd9532757b7ef7c35d2be6 (diff) | |
merge changes for exception handling
Diffstat (limited to 'indra/llcommon/llleap.cpp')
| -rw-r--r-- | indra/llcommon/llleap.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp index 84d2a12f65..c87d2a3e58 100644 --- a/indra/llcommon/llleap.cpp +++ b/indra/llcommon/llleap.cpp @@ -33,6 +33,7 @@ #include "lltimer.h" #include "lluuid.h" #include "llleaplistener.h" +#include "llexception.h" #if LL_MSVC #pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally @@ -69,7 +70,7 @@ public: // Rule out empty vector if (plugin.empty()) { - throw Error("no plugin command"); + LLTHROW(Error("no plugin command")); } // Don't leave desc empty either, but in this case, if we weren't @@ -112,7 +113,7 @@ public: // If that didn't work, no point in keeping this LLLeap object. if (! mChild) { - throw Error(STRINGIZE("failed to run " << mDesc)); + LLTHROW(Error(STRINGIZE("failed to run " << mDesc))); } // Okay, launch apparently worked. Change our mDonePump listener. |