diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-18 16:53:41 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-18 16:53:41 -0400 |
| commit | 63a0e89fb569216642bd9e023c503741feb9fec2 (patch) | |
| tree | 07a79f2b75ab1c5ac6fb9900ea29aa748d1c26b6 /indra/newview/llviewerwindow.cpp | |
| parent | 3e2db3d3364e3bb146da9d94b25638bd9fd7de29 (diff) | |
| parent | 615f2cb18e3ade418dbfeca738fad58a6022a9be (diff) | |
merge from hotfix to viewer-2-0 and resolve conflicts
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index adac4b9b40..e7d64c48a0 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1351,7 +1351,8 @@ LLViewerWindow::LLViewerWindow( mStatesDirty(false), mIsFullscreenChecked(false), mCurrResolutionIndex(0), - mViewerWindowListener(new LLViewerWindowListener(this)) + mViewerWindowListener(new LLViewerWindowListener(this)), + mProgressView(NULL) { LLNotificationChannel::buildChannel("VW_alerts", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alert")); LLNotificationChannel::buildChannel("VW_alertmodal", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alertmodal")); @@ -1588,8 +1589,7 @@ void LLViewerWindow::initBase() gToolTipView = getRootView()->getChild<LLToolTipView>("tooltip view"); // Add the progress bar view (startup view), which overrides everything - mProgressView = new LLProgressView(full_window); - getRootView()->addChild(mProgressView); + mProgressView = getRootView()->getChild<LLProgressView>("progress_view"); setShowProgress(FALSE); setProgressCancelButtonVisible(FALSE); |