diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-08 17:15:44 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-08 17:15:44 -0800 |
| commit | 3d70cca7029cc536725088c8ff5d58ad0222eb64 (patch) | |
| tree | 3bdc286929e7a2b913232f0a21137655b399bad5 /indra/newview/llviewerwindow.cpp | |
| parent | 1d590cd5fdecabbbf6e96be37a2673de347e2224 (diff) | |
| parent | 5aa5a77af66425dd90599b0b0cad5b8f58d7669a (diff) | |
Pull merge from richard/viewer-chui.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 3b2292c04d..ee838b19b7 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1824,8 +1824,8 @@ void LLViewerWindow::initBase() gDebugView->init(); gToolTipView = getRootView()->getChild<LLToolTipView>("tooltip view"); - // Initialize busy response message when logged in - LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLFloaterPreference::initBusyResponse)); + // Initialize do not disturb response message when logged in + LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLFloaterPreference::initDoNotDisturbResponse)); // Add the progress bar view (startup view), which overrides everything mProgressView = getRootView()->findChild<LLProgressView>("progress_view"); |