From 7f9ab127a8dd047d5641d7e0b9a68e720fd6e1e1 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 21 Mar 2023 18:24:32 -0400
Subject: [PATCH] Fix progress floater cancel button
---
indra/newview/llviewerwindow.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index aa7a59f8da7..202ccd4b50f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -110,6 +110,7 @@
#include "llfloatermap.h"
#include "llfloaternamedesc.h"
#include "llfloaterpreference.h"
+#include "llfloaterprogressview.h"
#include "llfloatersnapshot.h"
#include "llfloatertools.h"
#include "llfloaterworldmap.h"
@@ -5875,6 +5876,11 @@ void LLViewerWindow::setProgressPercent(const F32 percent)
void LLViewerWindow::setProgressCancelButtonVisible( BOOL b, const std::string& label )
{
+ LLFloaterProgressView* pProgFloater = LLFloaterReg::findTypedInstance<LLFloaterProgressView>("progress_view");
+ if(pProgFloater)
+ {
+ pProgFloater->setProgressCancelButtonVisible(b, label);
+ }
if (mProgressView)
{
mProgressView->setCancelButtonVisible( b, label );
--
GitLab