BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid throwing unhandlable exceptions in coroutines in RelWithDebInfo builds

1 files changed, 2 insertions, 8 deletions

diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
index 1882e39a88..7dd88fadb8 100755
--- a/indra/viewer_components/updater/llupdaterservice.cpp
+++ b/indra/viewer_components/updater/llupdaterservice.cpp
@@ -207,7 +207,6 @@ void LLUpdaterServiceImpl::initialize(const std::string&  url,
 	memcpy(mUniqueId, uniqueid, MD5HEX_STR_SIZE);
 	mWillingToTest = willing_to_test;
 
-#if BUG_2707
 	LL_DEBUGS("UpdaterService")
 		<< "\n  url: " << mUrl
 		<< "\n  path: " << mPath
@@ -216,7 +215,6 @@ void LLUpdaterServiceImpl::initialize(const std::string&  url,
 		<< "\n  uniqueid: " << mUniqueId
 		<< "\n  willing: " << ( mWillingToTest ? "testok" : "testno" )
 		<< LL_ENDL;
-#endif
 }
 
 void LLUpdaterServiceImpl::setCheckPeriod(unsigned int seconds)
@@ -435,14 +433,13 @@ void LLUpdaterServiceImpl::response(LLSD const & content)
 		LLURI url(content["url"].asString());
 		std::string more_info = content["more_info"].asString();
 
-		#if BUG_2707
 		LL_DEBUGS("UpdaterService")
 			<< "Starting download of "
 			<< ( required ? "required" : "optional" ) << " update"
 			<< " to channel '" << mNewChannel << "' version " << mNewVersion
 			<< " more info '" << more_info << "'"
 			<< LL_ENDL;
-		#endif
+
 		mUpdateDownloader.download(url, content["hash"].asString(), mNewChannel, mNewVersion, more_info, required);
 	}
 }
@@ -466,7 +463,6 @@ void LLUpdaterServiceImpl::downloadComplete(LLSD const & data)
 	payload["info_url"] = data["info_url"];
 	event["payload"] = payload;
 
-	#if BUG_2707
 	LL_DEBUGS("UpdaterService")
 		<< "Download complete "
 		<< ( data["required"].asBoolean() ? "required" : "optional" )
@@ -474,7 +470,6 @@ void LLUpdaterServiceImpl::downloadComplete(LLSD const & data)
 		<< " version " << mNewVersion
 		<< " info " << data["info_url"].asString()
 		<< LL_ENDL;
-	#endif
 
 	LLEventPumps::instance().obtain("mainlooprepeater").post(event);
 
@@ -551,8 +546,7 @@ bool LLUpdaterServiceImpl::onMainLoop(LLSD const & event)
 		// Check for failed install.
 		if(LLFile::isfile(ll_install_failed_marker_path()))
 		{
-			// BUG-2707?
-			//LL_DEBUGS("UpdaterService") << "found marker " << ll_install_failed_marker_path() << LL_ENDL;;
+			LL_DEBUGS("UpdaterService") << "found marker " << ll_install_failed_marker_path() << LL_ENDL;;
 			int requiredValue = 0; 
 			{
 				llifstream stream(ll_install_failed_marker_path());