summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-04 15:39:33 -0400
committerOz Linden <oz@lindenlab.com>2011-08-04 15:39:33 -0400
commitf42df4cd9fe8eb9e4a778dc9e5fdf94b4d6cfb59 (patch)
tree837c1eebc58b227f7049ee857fa6bd8fbbd25121 /indra/newview/llviewerwindow.cpp
parent94c171d89bae06d0bc259255a917db892019c369 (diff)
parent0b81c19cbe809f041e628da334c305ea33fae2e9 (diff)
merge changes for storm-1538
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index d7509b4e41..8d4f9b346f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4538,6 +4538,14 @@ void LLViewerWindow::setShowProgress(const BOOL show)
}
}
+void LLViewerWindow::setStartupComplete()
+{
+ if (mProgressView)
+ {
+ mProgressView->setStartupComplete();
+ }
+}
+
BOOL LLViewerWindow::getShowProgress() const
{
return (mProgressView && mProgressView->getVisible());