diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-08-17 10:38:21 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-08-17 10:38:21 -0700 |
| commit | 20a1f0be0bf050b18f49cb14f5db4941996a8bbc (patch) | |
| tree | abbb3ef3553858d18e9886b280c226a84ef22397 /indra/newview/llviewermenu.cpp | |
| parent | 34b4b3d13968f3ffec53c906198b2abc2145205a (diff) | |
| parent | e617a059f190271f8e2602b3b3287b0def9bfd2f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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: |
