diff options
| author | callum_linden <none@none> | 2013-04-17 13:38:04 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-04-17 13:38:04 -0700 |
| commit | 88eff41649b13f00f636e54e093fd5b8becf5f8c (patch) | |
| tree | f099a81df2c66e9940aa85ad1f47cc982a5eecc1 /indra/newview/llprogressview.cpp | |
| parent | 010c87788d5c698d6cfe5782ac02d9a3924124cf (diff) | |
| parent | fac6ee27f2d3277494f011271064b0e5e7e02554 (diff) | |
Merge with viewer-development
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 ); |