diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-01-20 16:00:28 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-01-20 16:00:28 +0800 |
| commit | ad3694fd4b6bfaf5621a12eb4536a1eb6a10f8f2 (patch) | |
| tree | bc343dc4a0f8a469ecab34e64b5c5dfe76ea1297 /indra/newview/llstartup.cpp | |
| parent | 45249de1ca418324c4077312eefc7edc7e22c401 (diff) | |
| parent | 306e9e6d0293ed6470db19c0882930fff0cd145f (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.12-ForeverFPS' into 2024.12-ForeverFPS
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 9b715be26e..3a7aaaeca1 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1534,7 +1534,7 @@ bool idle_startup() // create a container's instance for start a controlling conversation windows // by the voice's events LLFloaterIMContainer *im_inst = LLFloaterIMContainer::getInstance(); - if(gAgent.isFirstLogin()) + if(gAgent.isFirstLogin() && im_inst) { im_inst->openFloater(im_inst->getKey()); } |