diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-08-18 09:49:04 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-08-18 09:49:04 -0700 |
| commit | e83cb4e9591befc00006c4ef8ac91f4445447042 (patch) | |
| tree | 9d1e712a956fb4dff7a7d0b54150a058728ec5a6 /indra/newview/llviewermenu.cpp | |
| parent | a666878a011b9b1e8ebb922b42e1b300c7d2cc99 (diff) | |
| parent | 20a1f0be0bf050b18f49cb14f5db4941996a8bbc (diff) | |
Automated merge with bundle:D:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.uw1uld\ssh__richard@hg.lindenlab.com_richard_viewer-experience_njk05b.hg
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index ebd7c6c688..b29821479b 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7819,7 +7819,7 @@ class LLChangeMode : public view_listener_t { case 0: gSavedSettings.getControl("SessionSettingsFile")->set(new_session_settings_file); - LLAppViewer::instance()->forceQuit(); + LLAppViewer::instance()->requestQuit(); break; case 1: default: |