diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-04-06 16:32:25 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-04-06 16:32:25 +0100 |
| commit | bca5bb240d21e0f1bad5c3924587d62c1c7a7b7c (patch) | |
| tree | 36baeda88c70a7ca58059b316641c32139b5d3f1 /indra/newview/llviewercontrol.cpp | |
| parent | 704aeb09d81f0fa37e343460edb1ab11ba3dbc8c (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge remote-tracking branch 'origin/master' into SL-14999
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 8aa5b07561..76dc9a6790 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -510,7 +510,10 @@ bool handleHighResSnapshotChanged(const LLSD& newvalue) bool handleVoiceClientPrefsChanged(const LLSD& newvalue) { - LLVoiceClient::getInstance()->updateSettings(); + if (LLVoiceClient::instanceExists()) + { + LLVoiceClient::getInstance()->updateSettings(); + } return true; } |