diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2022-05-18 14:08:24 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2022-05-18 14:08:24 -0400 |
commit | c0aa1a1202678fdde0206c9372fb071c028cfe5b (patch) | |
tree | 614a5e0b9e24343c59709a9378050b601dd0f828 /indra/newview/llfloaterimsessiontab.cpp | |
parent | 06aa68c2fbcd83cb00465c9f14933bda276b11e8 (diff) | |
parent | a9363222618a879dd7d0d78471f8773af6b61618 (diff) |
SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219
Update task branch from main project branch.
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
-rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 2 |
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() |