diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-16 14:45:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-16 14:45:03 -0400 |
| commit | 1278223f36d1d07c32a0411fc6f8fad3b732e8ff (patch) | |
| tree | be5907cbcbedb08e075f0a510b704d34b9e83fae /indra/newview/llviewermenu.cpp | |
| parent | b8320207bb911a311a498426fdd4a987dd7748ea (diff) | |
| parent | 72ffcd147a85cb727d194a4c57360a1a69890cb1 (diff) | |
merge missing changesets for storm-1557
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: |