diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 17:11:17 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 17:11:17 -0400 |
| commit | 8897e7ca24533e0093825346391f5fa9a37f2427 (patch) | |
| tree | 781b08a7a90e53124d4f11b507be4d726544f0f0 /indra/newview/llfloaterurlentry.cpp | |
| parent | 79ab7c20703c092a4416a4f9a885e0246fc17ee0 (diff) | |
| parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) | |
Merge. Refresh from viewer-release after 3.7.16 release.
Diffstat (limited to 'indra/newview/llfloaterurlentry.cpp')
| -rwxr-xr-x | indra/newview/llfloaterurlentry.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp index e26f1e9ea5..e02e8eeb5a 100755 --- a/indra/newview/llfloaterurlentry.cpp +++ b/indra/newview/llfloaterurlentry.cpp @@ -204,6 +204,10 @@ void LLFloaterURLEntry::onBtnOK( void* userdata ) LLURLHistory::addURL("parcel", media_url); } + // show progress bar here? + getWindow()->incBusyCount(); + self->getChildView("loading_label")->setVisible( true); + // leading whitespace causes problems with the MIME-type detection so strip it LLStringUtil::trim( media_url ); @@ -233,10 +237,6 @@ void LLFloaterURLEntry::onBtnOK( void* userdata ) self->getChildView("ok_btn")->setEnabled(false); self->getChildView("cancel_btn")->setEnabled(false); self->getChildView("media_entry")->setEnabled(false); - - // show progress bar here? - getWindow()->incBusyCount(); - self->getChildView("loading_label")->setVisible( true); } // static |