diff options
| author | James Cook <james@lindenlab.com> | 2010-03-10 20:32:56 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-10 20:32:56 -0800 |
| commit | f0d3ea53cd570eeca88df1d0c7d8a73c0877789b (patch) | |
| tree | 7cfb648d666fcfeaf7fc5ef2b13bb21870bedc0a /indra/newview/llviewerwindow.cpp | |
| parent | dbc22bea7bba0c903a5090b24814f97b61a604b6 (diff) | |
| parent | dcbf0ab31ba256791e58dfc2aa3bf61609a8a797 (diff) | |
Merge latest from viewer-hotfix, including fix for TOS screen
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 16b8711561..fd609637a6 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1348,7 +1348,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")); @@ -1585,8 +1586,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); |