diff options
author | Richard Nelson <none@none> | 2010-08-13 14:02:20 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-08-13 14:02:20 -0700 |
commit | 143bf98d7356d0424eac114cbf35e8738410ed5e (patch) | |
tree | 9a64adf6e07d77c14c81024fead8247569f1e439 /indra/newview/llprogressview.cpp | |
parent | 1dd490ff88e7ee54b689e01529ffb88a3fc7491b (diff) | |
parent | 014a4f3dc9dbe2eef7e463267d264d981e173835 (diff) |
merge
Diffstat (limited to 'indra/newview/llprogressview.cpp')
-rw-r--r-- | indra/newview/llprogressview.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 9b5e38d0aa..c4bf65e06d 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -134,15 +134,10 @@ void LLProgressView::setVisible(BOOL visible) if (getVisible() && !visible) { mFadeTimer.start(); - // hiding progress view, so show menu bars - LLUI::getRootView()->getChildView("menu_bar_holder")->setVisible(TRUE); } // showing progress view else if (!getVisible() && visible) { - // showing progress view, so hide menu bars - LLUI::getRootView()->getChildView("menu_bar_holder")->setVisible(FALSE); - setFocus(TRUE); mFadeTimer.stop(); mProgressTimer.start(); |