Merged in lindenlab/viewer-release

1 files changed, 8 insertions, 7 deletions

diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp
index e38fc5b2a6..97270e4931 100644
--- a/indra/llcommon/llevents.cpp
+++ b/indra/llcommon/llevents.cpp
@@ -57,6 +57,7 @@
 #include "stringize.h"
 #include "llerror.h"
 #include "llsdutil.h"
+#include "llexception.h"
 #if LL_MSVC
 #pragma warning (disable : 4702)
 #endif
@@ -174,7 +175,7 @@ std::string LLEventPumps::registerNew(const LLEventPump& pump, const std::string
     // Unless we're permitted to tweak it, that's Bad.
     if (! tweak)
     {
-        throw LLEventPump::DupPumpName(std::string("Duplicate LLEventPump name '") + name + "'");
+        LLTHROW(LLEventPump::DupPumpName("Duplicate LLEventPump name '" + name + "'"));
     }
     // The passed name isn't unique, but we're permitted to tweak it. Find the
     // first decimal-integer suffix not already taken. The insert() attempt
@@ -335,8 +336,8 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLEventL
         // is only when the existing connection object is still connected.
         if (found != mConnections.end() && found->second.connected())
         {
-            throw DupListenerName(std::string("Attempt to register duplicate listener name '") + name +
-                "' on " + typeid(*this).name() + " '" + getName() + "'");
+        LLTHROW(DupListenerName("Attempt to register duplicate listener name '" + name +
+                                "' on " + typeid(*this).name() + " '" + getName() + "'"));
         }
         // Okay, name is unique, try to reconcile its dependencies. Specify a new
         // "node" value that we never use for an mSignal placement; we'll fix it
@@ -362,8 +363,8 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLEventL
             // unsortable. If we leave the new node in mDeps, it will continue
             // to screw up all future attempts to sort()! Pull it out.
             mDeps.remove(name);
-            throw Cycle(std::string("New listener '") + name + "' on " + typeid(*this).name() +
-                " '" + getName() + "' would cause cycle: " + e.what());
+        LLTHROW(Cycle("New listener '" + name + "' on " + typeid(*this).name() +
+                      " '" + getName() + "' would cause cycle: " + e.what()));
         }
         // Walk the list to verify that we haven't changed the order.
         float previous = 0.0, myprev = 0.0;
@@ -427,7 +428,7 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLEventL
                 // NOW remove the offending listener node.
                 mDeps.remove(name);
                 // Having constructed a description of the order change, inform caller.
-                throw OrderChange(out.str());
+            LLTHROW(OrderChange(out.str()));
             }
             // This node becomes the previous one.
             previous = dmi->second;
@@ -627,7 +628,7 @@ bool LLListenerOrPumpName::operator()(const LLSD& event) const
 {
     if (! mListener)
     {
-        throw Empty("attempting to call uninitialized");
+        LLTHROW(Empty("attempting to call uninitialized"));
     }
     return (*mListener)(event);
 }