diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:48:19 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:48:19 +0300 |
| commit | 347126a64412378778cca1de856049fd3070607b (patch) | |
| tree | 1ed214ddb452b273c1f89137f2f85b3260c83c6c /indra/newview/llstartup.cpp | |
| parent | 2febf90744624120b9d93708792ed5aaedb8ad14 (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DRTVWR-520-apple-notarization
# Conflicts:
# autobuild.xml
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 17777c3ceb..e2a39bdf86 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1425,7 +1425,10 @@ bool idle_startup() // update the voice settings *after* gCacheName initialization // so that we can construct voice UI that relies on the name cache - LLVoiceClient::getInstance()->updateSettings(); + if (LLVoiceClient::instanceExists()) + { + LLVoiceClient::getInstance()->updateSettings(); + } display_startup(); // create a container's instance for start a controlling conversation windows |