diff options
| author | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 14:35:28 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 14:35:28 -0700 |
| commit | 930b8ed36e56e08a9449833073dbdd0017bcbaa4 (patch) | |
| tree | 829bb63a8e777eef0c622c085671aebe8ae351c1 /indra/newview/llstartup.cpp | |
| parent | 45af049a479928208a1ad30a90c1db6be1969f9a (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge with ti of master after Viewer release
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 |