diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-04-01 15:17:13 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-04-01 15:17:13 -0600 |
| commit | 98580cd85ca77a3e405756d1354a449c3347d13d (patch) | |
| tree | 3b98591209c59c8e08abd3d330285ef6f4eb6b56 /indra/newview/llstartup.cpp | |
| parent | ebadc409de90c75f96a005e8f45a3eee4ad243e0 (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DV528-merge-6.4.18
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 7a2eb45ab9..929e8c3dae 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1428,7 +1428,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 |