summaryrefslogtreecommitdiff
path: root/indra/viewer_components/updater/llupdaterservice.cpp
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-06-02 14:41:57 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-06-02 14:41:57 -0700
commit842a6c6e46ff14bca4bd142b6edcd8b2964f2587 (patch)
treed5e0c91e24052fb5685242b8ade0bfee4e8c0a79 /indra/viewer_components/updater/llupdaterservice.cpp
parentcf3d2a06a13528cca1327becfb9e8dcb5ff4614a (diff)
BUG-2707 disable more login/update-sequence specific logging
Diffstat (limited to 'indra/viewer_components/updater/llupdaterservice.cpp')
-rwxr-xr-xindra/viewer_components/updater/llupdaterservice.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
index 1bd9fa4fc0..1882e39a88 100755
--- a/indra/viewer_components/updater/llupdaterservice.cpp
+++ b/indra/viewer_components/updater/llupdaterservice.cpp
@@ -206,6 +206,8 @@ void LLUpdaterServiceImpl::initialize(const std::string& url,
mPlatformVersion = platform_version;
memcpy(mUniqueId, uniqueid, MD5HEX_STR_SIZE);
mWillingToTest = willing_to_test;
+
+#if BUG_2707
LL_DEBUGS("UpdaterService")
<< "\n url: " << mUrl
<< "\n path: " << mPath
@@ -214,6 +216,7 @@ void LLUpdaterServiceImpl::initialize(const std::string& url,
<< "\n uniqueid: " << mUniqueId
<< "\n willing: " << ( mWillingToTest ? "testok" : "testno" )
<< LL_ENDL;
+#endif
}
void LLUpdaterServiceImpl::setCheckPeriod(unsigned int seconds)
@@ -431,12 +434,15 @@ void LLUpdaterServiceImpl::response(LLSD const & content)
BOOL required = content["required"].asBoolean();
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);
}
}
@@ -459,6 +465,8 @@ void LLUpdaterServiceImpl::downloadComplete(LLSD const & data)
payload["channel"] = mNewChannel;
payload["info_url"] = data["info_url"];
event["payload"] = payload;
+
+ #if BUG_2707
LL_DEBUGS("UpdaterService")
<< "Download complete "
<< ( data["required"].asBoolean() ? "required" : "optional" )
@@ -466,6 +474,7 @@ void LLUpdaterServiceImpl::downloadComplete(LLSD const & data)
<< " version " << mNewVersion
<< " info " << data["info_url"].asString()
<< LL_ENDL;
+ #endif
LLEventPumps::instance().obtain("mainlooprepeater").post(event);
@@ -542,7 +551,8 @@ bool LLUpdaterServiceImpl::onMainLoop(LLSD const & event)
// Check for failed install.
if(LLFile::isfile(ll_install_failed_marker_path()))
{
- LL_DEBUGS("UpdaterService") << "found marker " << ll_install_failed_marker_path() << LL_ENDL;;
+ // BUG-2707?
+ //LL_DEBUGS("UpdaterService") << "found marker " << ll_install_failed_marker_path() << LL_ENDL;;
int requiredValue = 0;
{
llifstream stream(ll_install_failed_marker_path());