3 files changed, 7 insertions, 10 deletions
diff --git a/indra/llmessage/llhttpnode.cpp b/indra/llmessage/llhttpnode.cpp
index 48ce258ba2..04b34a296c 100644
--- a/indra/llmessage/llhttpnode.cpp
+++ b/indra/llmessage/llhttpnode.cpp
@@ -32,7 +32,6 @@
 #include "llstl.h"
 #include "llhttpconstants.h"
 #include "llexception.h"
-#include <boost/throw_exception.hpp>
 
 const std::string CONTEXT_HEADERS("headers");
 const std::string CONTEXT_PATH("path");
@@ -103,19 +102,19 @@ namespace {
 // virtual
 LLSD LLHTTPNode::simpleGet() const
 {
-	BOOST_THROW_EXCEPTION(NotImplemented());
+	LLTHROW(NotImplemented());
 }
 
 // virtual
 LLSD LLHTTPNode::simplePut(const LLSD& input) const
 {
-	BOOST_THROW_EXCEPTION(NotImplemented());
+	LLTHROW(NotImplemented());
 }
 
 // virtual
 LLSD LLHTTPNode::simplePost(const LLSD& input) const
 {
-	BOOST_THROW_EXCEPTION(NotImplemented());
+	LLTHROW(NotImplemented());
 }
 
 
@@ -175,7 +174,7 @@ void LLHTTPNode::del(LLHTTPNode::ResponsePtr response, const LLSD& context) cons
 // virtual
 LLSD LLHTTPNode::simpleDel(const LLSD&) const
 {
-	BOOST_THROW_EXCEPTION(NotImplemented());
+	LLTHROW(NotImplemented());
 }
 
 // virtual
diff --git a/indra/llmessage/tests/commtest.h b/indra/llmessage/tests/commtest.h
index 5dff56b44f..7c8f27bbd2 100644
--- a/indra/llmessage/tests/commtest.h
+++ b/indra/llmessage/tests/commtest.h
@@ -38,7 +38,6 @@
 #include <map>
 #include <string>
 #include <boost/lexical_cast.hpp>
-#include <boost/throw_exception.hpp>
 
 struct CommtestError: public LLException
 {
@@ -69,7 +68,7 @@ static int query_port(const std::string& var)
     const char* cport = getenv(var.c_str());
     if (! cport)
     {
-        BOOST_THROW_EXCEPTION(CommtestError(STRINGIZE("missing environment variable" << var)));
+        LLTHROW(CommtestError(STRINGIZE("missing environment variable" << var)));
     }
     // This will throw, too, if the value of PORT isn't numeric.
     int port(boost::lexical_cast<int>(cport));
diff --git a/indra/llmessage/tests/networkio.h b/indra/llmessage/tests/networkio.h
index 6aaecf9bac..5eb739393f 100644
--- a/indra/llmessage/tests/networkio.h
+++ b/indra/llmessage/tests/networkio.h
@@ -35,7 +35,6 @@
 #include "llpumpio.h"
 #include "llhttpclient.h"
 #include "llexception.h"
-#include <boost/throw_exception.hpp>
 
 /*****************************************************************************
 *   NetworkIO
@@ -53,7 +52,7 @@ public:
         ll_init_apr();
         if (! gAPRPoolp)
         {
-            BOOST_THROW_EXCEPTION(LLException("Can't initialize APR"));
+            LLTHROW(LLException("Can't initialize APR"));
         }
 
         // Create IO Pump to use for HTTP Requests.
@@ -61,7 +60,7 @@ public:
         LLHTTPClient::setPump(*mServicePump);
         if (ll_init_ares() == NULL || !gAres->isInitialized())
         {
-            BOOST_THROW_EXCEPTION(LLException("Can't start DNS resolver"));
+            LLTHROW(LLException("Can't start DNS resolver"));
         }
 
         // You can interrupt pump() without waiting the full timeout duration