Work on CHOP-135: Hooking up setting UpdaterServiceActive to functionality. Paired with Mani.

Toggling the setting now calls LLUpdaterService::startChecking() and LLUpdaterService::stopChecking(), which enable and disable the service.

1 files changed, 11 insertions, 6 deletions

diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
index 6a40246497..58f2c7da76 100644
--- a/indra/viewer_components/updater/llupdaterservice.cpp
+++ b/indra/viewer_components/updater/llupdaterservice.cpp
@@ -175,12 +175,6 @@ void LLUpdaterServiceImpl::initialize(const std::string& protocol_version,
 	mPath = path;
 	mChannel = channel;
 	mVersion = version;
-
-	// Check to see if an install is ready.
-	if(!checkForInstall())
-	{
-		checkForResume();
-	}	
 }
 
 void LLUpdaterServiceImpl::setCheckPeriod(unsigned int seconds)
@@ -198,6 +192,12 @@ void LLUpdaterServiceImpl::startChecking()
 
 	mIsChecking = true;
 
+    // Check to see if an install is ready.
+	if(!checkForInstall())
+	{
+		checkForResume();
+	}
+
 	if(!mIsDownloading)
 	{
 		// Checking can only occur during the mainloop.
@@ -214,6 +214,11 @@ void LLUpdaterServiceImpl::stopChecking()
 		mIsChecking = false;
 		mTimer.stop();
 	}
+
+    if(mIsDownloading)
+    {
+        this->mUpdateDownloader.cancel();
+    }
 }
 
 bool LLUpdaterServiceImpl::isChecking()