summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsessiontab.cpp
diff options
context:
space:
mode:
authorBrad Kittenbrink <brad@lindenlab.com>2022-04-18 13:29:25 -0700
committerBrad Kittenbrink <brad@lindenlab.com>2022-04-18 13:29:25 -0700
commite9921e77b0a6c66855204db82d56de7925651a4d (patch)
tree510e353b4e773e18f95bd7312c813189f947dbb6 /indra/newview/llfloaterimsessiontab.cpp
parentefb9df04c3899c269f0c17d2473b4472d5f31ee5 (diff)
parentd031662435d97101411ae990ed85d6e001ab668a (diff)
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
-rw-r--r--indra/newview/llfloaterimsessiontab.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 43dc304c10..34499ac170 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -384,7 +384,7 @@ void LLFloaterIMSessionTab::draw()
void LLFloaterIMSessionTab::enableDisableCallBtn()
{
- if (LLVoiceClient::instanceExists())
+ if (LLVoiceClient::instanceExists() && mVoiceButton)
{
mVoiceButton->setEnabled(
mSessionID.notNull()