diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 23:57:11 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 23:57:11 +0300 |
commit | 53ed0ec70ce5c774c57c9783050c7e1b35885eec (patch) | |
tree | 62015d4736d86dc1cebc378ff59c33b1e01f42bc /indra/newview/llappviewer.cpp | |
parent | 784436a5b89062df69251c9ac28904f06a018011 (diff) | |
parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) |
Merge branch 'main' into DRTVWR-567
# Conflicts:
# doc/contributions.txt
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5cb5b8d0b4..94e0f20267 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2173,6 +2173,7 @@ bool LLAppViewer::cleanup() LLSelectMgr::deleteSingleton(); LLViewerEventRecorder::deleteSingleton(); LLWorld::deleteSingleton(); + LLVoiceClient::deleteSingleton(); // It's not at first obvious where, in this long sequence, a generic cleanup // call OUGHT to go. So let's say this: as we migrate cleanup from |