diff options
author | Graham Linden <none@none> | 2014-09-25 09:20:01 -0700 |
---|---|---|
committer | Graham Linden <none@none> | 2014-09-25 09:20:01 -0700 |
commit | 9f4788d7a8a924de654d55bfb102a81f797a9cf9 (patch) | |
tree | 742fb8127dc84052265647ed110e8a6446253103 /indra/newview/llfloaterurlentry.cpp | |
parent | 6004ad167458914c3b85438b96e81ea8796e368b (diff) | |
parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) |
Merge viewer-release 3.7.17
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 |