diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-13 19:45:42 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-13 19:45:42 +0300 |
| commit | deb1c21a7aaabf035b8b86aa3860b259b411d12d (patch) | |
| tree | f2735c27abd0f3293ff02f7407e5f6151822bdd2 | |
| parent | e624d8287365148682185d1f90e2bcf91d569cdf (diff) | |
SL-13034 Last string in logs should say 'Goodbye'
Speaker volume saving was last instead of 'Goodbye'.
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llvoiceclient.h | 4 |
2 files changed, 10 insertions, 1 deletions
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: /** |