From deb1c21a7aaabf035b8b86aa3860b259b411d12d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 13 May 2020 19:45:42 +0300
Subject: SL-13034 Last string in logs should say 'Goodbye'
Speaker volume saving was last instead of 'Goodbye'.
---
indra/newview/llvoiceclient.cpp | 7 ++++++-
indra/newview/llvoiceclient.h | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
(limited to 'indra')
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index cc590fc947..377f3174f3 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -981,7 +981,12 @@ LLSpeakerVolumeStorage::LLSpeakerVolumeStorage()
LLSpeakerVolumeStorage::~LLSpeakerVolumeStorage()
{
- save();
+}
+
+//virtual
+void LLSpeakerVolumeStorage::cleanupSingleton()
+{
+ save();
}
void LLSpeakerVolumeStorage::storeSpeakerVolume(const LLUUID& speaker_id, F32 volume)
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 3d04e1f0db..4c3f737d24 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -502,6 +502,10 @@ class LLSpeakerVolumeStorage : public LLSingleton<LLSpeakerVolumeStorage>
LLSINGLETON(LLSpeakerVolumeStorage);
~LLSpeakerVolumeStorage();
LOG_CLASS(LLSpeakerVolumeStorage);
+
+protected:
+ virtual void cleanupSingleton() override;
+
public:
/**
--
cgit v1.2.3