diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-10 23:21:56 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-10 23:21:56 +0300 |
| commit | b31a93baa83dc232e331a0420800fcb6d7faa2d3 (patch) | |
| tree | d19b0dcd8340aa15d3ecfb1156ca463ab9a495fc /indra/newview/llappviewer.cpp | |
| parent | 83651c49dd42d32bed8f1a3583a61e9226f85f9e (diff) | |
| parent | 05fcbb5df96c93fa2ba61411c34dcb097ab02c61 (diff) | |
Upstream merge from lindenlab/viewer-neko
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 12a459b2b8..2a928a47a2 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -68,6 +68,7 @@ #include "llviewerwindow.h" #include "llviewerdisplay.h" #include "llviewermedia.h" +#include "llviewerparcelaskplay.h" #include "llviewerparcelmedia.h" #include "llviewermediafocus.h" #include "llviewermessage.h" @@ -1938,6 +1939,11 @@ bool LLAppViewer::cleanup() { gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE); LL_INFOS() << "Saved settings" << LL_ENDL; + + if (LLViewerParcelAskPlay::instanceExists()) + { + LLViewerParcelAskPlay::getInstance()->saveSettings(); + } } std::string warnings_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Warnings")); |