diff options
| author | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 17:14:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 17:14:24 -0700 |
| commit | 645cf6a5d26b21cd873238c2ac8417d0b1abd37a (patch) | |
| tree | 2690e7dc8a233bd000f4ffd288aafcb1007006ea /indra/newview/llstartup.cpp | |
| parent | 9f95e619c9802bd405db43afa3fbf6b5ad82799d (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DRTVWR-519
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 f281b30a8e..b71a26a105 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1417,7 +1417,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 |