diff options
| author | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:39:50 +0000 |
|---|---|---|
| committer | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:39:50 +0000 |
| commit | 7021288859036789dc268233cc1a3401d6082721 (patch) | |
| tree | 2d6a4d9e87785a8bc236215e5e0102a553a0ee5f /indra/newview/llfloaterurlentry.cpp | |
| parent | 7714c7679da7c6c28c3f3f09af6b586a680dc26c (diff) | |
| parent | 19bc1ee671df2f89d990dfe8aadea1d9ea424e82 (diff) | |
Pull in viewer-lion to cut off DRTVWR-373
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 |