diff options
author | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 21:52:37 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 21:52:37 +0000 |
commit | 08f04113c9252258c9cb6132efa327432c3c27e0 (patch) | |
tree | 5ec6c6d42eaca354f58e21b926d9108e43367484 /indra/newview/llfloaterurlentry.cpp | |
parent | 10f84d8244d01728338f1eb20b0b25271fc7db63 (diff) | |
parent | aa322d8eb4341c213a19cef87a887114c1ca278b (diff) |
Merged in DV541-merge-6.4.22 (pull request #629)
DRTVWR-541 merge up to v 6.4.22
Diffstat (limited to 'indra/newview/llfloaterurlentry.cpp')
-rw-r--r-- | indra/newview/llfloaterurlentry.cpp | 9 |
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(); +} |