Commit c2cecbd3 authored by NiranV's avatar NiranV
Browse files

Changed: Skip transition of progress screen on logout to hide rendering...

Changed: Skip transition of progress screen on logout to hide rendering shutdown (pink world) like in other Viewers.
parent ef06c6e9
......@@ -5269,7 +5269,7 @@ void LLAppViewer::idleShutdown()
sendLogoutRequest();
// Wait for a LogoutReply message
gViewerWindow->setShowProgress(TRUE);
gViewerWindow->setShowProgress(TRUE, TRUE);
gViewerWindow->setProgressPercent(100.f);
gViewerWindow->setProgressString(LLTrans::getString("LoggingOut"));
return;
......
......@@ -148,7 +148,7 @@ void LLProgressView::setStartupComplete()
mFadeToWorldTimer.start();
}
void LLProgressView::setVisible(BOOL visible)
void LLProgressView::setVisible(BOOL visible, BOOL logout)
{
if (!visible && mFadeFromLoginTimer.getStarted())
{
......@@ -162,6 +162,11 @@ void LLProgressView::setVisible(BOOL visible)
// showing progress view
else if (visible && (!getVisible() || mFadeToWorldTimer.getStarted()))
{
if (logout)
{
getChild<LLIconCtrl>("loading_bg")->setVisible(false);
LLPanel::setBackgroundVisible(true);
}
setFocus(TRUE);
mFadeToWorldTimer.stop();
LLPanel::setVisible(TRUE);
......@@ -224,6 +229,9 @@ void LLProgressView::draw()
//BD
F32 alpha;
//BD
setTip();
if (mFadeFromLoginTimer.getStarted())
{
//BD
......@@ -278,10 +286,6 @@ void LLProgressView::draw()
return;
}
//BD
setTip();
// draw children
LLPanel::draw();
}
......
......@@ -57,7 +57,7 @@ class LLProgressView :
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
/*virtual*/ void setVisible(BOOL visible);
/*virtual*/ void setVisible(BOOL visible, BOOL logout = false);
void setPercent(const F32 percent);
......
......@@ -5338,14 +5338,21 @@ void LLViewerWindow::revealIntroPanel()
//BD
//mProgressView->revealIntroPanel();
}
}
}
void LLViewerWindow::setShowProgress(const BOOL show)
void LLViewerWindow::setShowProgress(const BOOL show, BOOL logout)
{
if (mProgressView)
{
// ## Zi: Fade teleport screens
mProgressView->fade(show);
if (logout)
{
mProgressView->setVisible(show, logout);
}
else
{
// ## Zi: Fade teleport screens
mProgressView->fade(show);
}
}
}
......
......@@ -304,7 +304,7 @@ class LLViewerWindow : public LLWindowCallbacks
BOOL getCursorHidden() { return mCursorHidden; }
void moveCursorToCenter(); // move to center of window
void setShowProgress(const BOOL show);
void setShowProgress(const BOOL show, BOOL logout = false);
BOOL getShowProgress() const;
void setProgressString(const std::string& string);
void setProgressPercent(const F32 percent);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment