diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-01-30 21:30:20 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-01-30 21:30:20 +0200 |
| commit | 84148762d974e728dbcb33f16aa641054ab0b641 (patch) | |
| tree | d8a4477ea987de4eada4aca30a4ef4639e7ae077 /indra/newview/llprogressview.cpp | |
| parent | b96f04a1bb0577d42059246d15c244702ff02f88 (diff) | |
| parent | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff) | |
merging
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 ); |