From 6b203f2ee4bbaf893b7256e35581403b18de68f3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 19 Mar 2020 21:39:05 +0200
Subject: SL-12607 FMOD Logo

---
 indra/newview/llprogressview.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/newview/llprogressview.cpp')

diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 083a913ef8..dfa6c97b26 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -42,6 +42,7 @@
 #include "llbutton.h"
 #include "llcallbacklist.h"
 #include "llfocusmgr.h"
+#include "lliconctrl.h"
 #include "llnotifications.h"
 #include "llprogressbar.h"
 #include "llstartup.h"
@@ -183,6 +184,7 @@ void LLProgressView::setVisible(BOOL visible)
 	if (getVisible() && !visible)
 	{
 		LLPanel::setVisible(FALSE);
+		setShowLogos(FALSE);
 	}
 	// showing progress view
 	else if (visible && (!getVisible() || mFadeToWorldTimer.getStarted()))
@@ -309,6 +311,18 @@ void LLProgressView::setMessage(const std::string& msg)
 	getChild<LLUICtrl>("message_text")->setValue(mMessage);
 }
 
+void LLProgressView::setShowLogos(const BOOL logos_visible)
+{
+    LLIconCtrl* logo = getChild<LLIconCtrl>("fmod_logo");
+    if (logos_visible)
+    {
+        logo->setValue(IMG_LOGO_FMOD);
+    }
+    logo->setVisible(logos_visible);
+    getChild<LLUICtrl>("fmod_text")->setVisible(logos_visible);
+    getChild<LLUICtrl>("message_text")->setVisible(!logos_visible);
+}
+
 void LLProgressView::setCancelButtonVisible(BOOL b, const std::string& label)
 {
 	mCancelBtn->setVisible( b );
-- 
cgit v1.2.3