diff options
| author | Cho <cho@lindenlab.com> | 2013-01-30 02:56:33 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-30 02:56:33 +0000 |
| commit | a7e6dc088fcd3d70dd74f0eef3c120ecd9296913 (patch) | |
| tree | 09d1c90cf506793326ff7d75e9f5d2833d1b0a72 /indra/newview/llprogressview.cpp | |
| parent | 4f0237007a3a21cc502a1a15b0530bceaf5217db (diff) | |
| parent | edb5be4ec0a88931933a27dc7e94d45ea249591d (diff) | |
merging latest changes
Diffstat (limited to 'indra/newview/llprogressview.cpp')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index f86e583b9e..989f0b0e60 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -96,7 +96,7 @@ BOOL LLProgressView::postBuild() getChild<LLTextBox>("message_text")->setClickedCallback(onClickMessage, this); // hidden initially, until we need it - LLPanel::setVisible(FALSE); + setVisible(FALSE); LLNotifications::instance().getChannel("AlertModal")->connectChanged(boost::bind(&LLProgressView::onAlertModal, this, _1)); @@ -265,7 +265,7 @@ void LLProgressView::draw() gFocusMgr.releaseFocusIfNeeded( this ); // turn off panel that hosts intro so we see the world - LLPanel::setVisible(FALSE); + setVisible(FALSE); // stop observing events since we no longer care mMediaCtrl->remObserver( this ); |