diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-04-01 14:49:07 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-04-01 14:49:07 -0600 |
| commit | 3cad30d9ee6a0cd2a68ed213e7383fa11df9d9f5 (patch) | |
| tree | 8f47ce24e0d455c0478e6266d8a7c3874883e055 /indra/newview/llviewercontrol.cpp | |
| parent | d357bf7ae5c5e0b6e66e7d82ce1677360b4cb990 (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DV525-merge-6.4.18
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; } |