MAINT-5174 Add Check for Updates feature to Help menu

2 files changed, 19 insertions, 0 deletions

diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
index c152493a51..abf4ac5e21 100755
--- a/indra/viewer_components/updater/llupdaterservice.cpp
+++ b/indra/viewer_components/updater/llupdaterservice.cpp
@@ -132,6 +132,7 @@ public:
 
 	void startChecking(bool install_if_ready);
 	void stopChecking();
+	bool forceCheck();
 	bool isChecking();
 	LLUpdaterService::eUpdaterState getState();
 	
@@ -266,6 +267,18 @@ void LLUpdaterServiceImpl::stopChecking()
 	setState(LLUpdaterService::TERMINAL);
 }
 
+bool LLUpdaterServiceImpl::forceCheck()
+{
+	if (mTimer.getStarted()
+		&& !mIsDownloading)
+	{
+		mTimer.setTimerExpirySec(0);
+		setState(LLUpdaterService::CHECKING_FOR_UPDATE);
+		return true;
+	}
+	return false;
+}
+
 bool LLUpdaterServiceImpl::isChecking()
 {
 	return mIsChecking;
@@ -672,6 +685,11 @@ void LLUpdaterService::stopChecking()
 	mImpl->stopChecking();
 }
 
+bool LLUpdaterService::forceCheck()
+{
+	return mImpl->forceCheck();
+}
+
 bool LLUpdaterService::isChecking()
 {
 	return mImpl->isChecking();
diff --git a/indra/viewer_components/updater/llupdaterservice.h b/indra/viewer_components/updater/llupdaterservice.h
index 0ddf24935b..95bbe1695c 100755
--- a/indra/viewer_components/updater/llupdaterservice.h
+++ b/indra/viewer_components/updater/llupdaterservice.h
@@ -84,6 +84,7 @@ public:
 	
 	void startChecking(bool install_if_ready = false);
 	void stopChecking();
+	bool forceCheck();
 	bool isChecking();
 	eUpdaterState getState();