summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterurlentry.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-07-20 00:57:39 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-07-20 00:58:09 +0300
commitb8d846f0eda7edc45fda3c311f0f5864801ed0f5 (patch)
treea8a1c8b5c5b0117dbff0ed187a72e7c8599745bb /indra/newview/llfloaterurlentry.cpp
parenta5675bedbb2bd34ce03dd16651dc74d8078efea9 (diff)
parentbe6066eae218856f7fd74b98968a75e5062fa830 (diff)
Merge master (DRTVWR-516) into DRTVWR-542-meshopt
Diffstat (limited to 'indra/newview/llfloaterurlentry.cpp')
-rw-r--r--indra/newview/llfloaterurlentry.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp
index f2efef0c33..63bce3d2eb 100644
--- a/indra/newview/llfloaterurlentry.cpp
+++ b/indra/newview/llfloaterurlentry.cpp
@@ -122,8 +122,7 @@ void LLFloaterURLEntry::headerFetchComplete(S32 status, const std::string& mime_
}
}
- // Decrement the cursor
- getWindow()->decBusyCount();
+
getChildView("loading_label")->setVisible( false);
closeFloater();
}
@@ -302,3 +301,9 @@ bool LLFloaterURLEntry::callback_clear_url_list(const LLSD& notification, const
}
return false;
}
+
+void LLFloaterURLEntry::onClose( bool app_quitting )
+{
+ // Decrement the cursor
+ getWindow()->decBusyCount();
+}