Merge

1 files changed, 7 insertions, 4 deletions

diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
index 788955a1b2..0bdd1ede43 100644
--- a/indra/viewer_components/updater/llupdaterservice.cpp
+++ b/indra/viewer_components/updater/llupdaterservice.cpp
@@ -35,6 +35,7 @@
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/throw_exception.hpp>
 #include "lldir.h"
 #include "llsdserialize.h"
 #include "llfile.h"
@@ -190,8 +191,9 @@ void LLUpdaterServiceImpl::initialize(const std::string&  channel,
 {
 	if(mIsChecking || mIsDownloading)
 	{
-		throw LLUpdaterService::UsageError("LLUpdaterService::initialize call "
-										   "while updater is running.");
+		BOOST_THROW_EXCEPTION(
+			LLUpdaterService::UsageError("LLUpdaterService::initialize call "
+										 "while updater is running."));
 	}
 		
 	mChannel = channel;
@@ -222,8 +224,9 @@ void LLUpdaterServiceImpl::startChecking(bool install_if_ready)
 {
 	if(mChannel.empty() || mVersion.empty())
 	{
-		throw LLUpdaterService::UsageError("Set params before call to "
-			"LLUpdaterService::startCheck().");
+		BOOST_THROW_EXCEPTION(
+			LLUpdaterService::UsageError("Set params before call to "
+										 "LLUpdaterService::startCheck()."));
 	}
 
 	mIsChecking = true;