diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-06 13:01:56 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-06 13:01:56 -0400 |
| commit | 2a59fef6beff7144085ea98ede4a3b4300248d7f (patch) | |
| tree | 96ac7748d02e437de34639a51772af2040ce7170 /indra/newview/llviewerwindow.cpp | |
| parent | f5e8457e4e4fad1d823c51d86c01fdc2ae08401c (diff) | |
| parent | 291b38717805f7de41af447c651c5b91352d0a51 (diff) | |
Merge. Pull from /lindenlab/viewer-cat prior to push.
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 136e61389a..c65caea3ec 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2036,8 +2036,8 @@ void LLViewerWindow::shutdownViews() } llinfos << "Global views cleaned." << llendl ; - LLNotificationsUI::LLToast::cleanupToasts();
- llinfos << "Leftover toast cleaned up." << llendl;
+ LLNotificationsUI::LLToast::cleanupToasts(); + llinfos << "Leftover toast cleaned up." << llendl; // DEV-40930: Clear sModalStack. Otherwise, any LLModalDialog left open // will crump with LL_ERRS. |