diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-08-15 09:41:54 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-08-15 09:41:54 -0700 |
| commit | 5f26ba801475d1a212b00503197dbc5a77cee1d8 (patch) | |
| tree | cf8aa8c3189462ea3ac51866be243e6fd8a70be6 /indra/newview/llfloaterimsessiontab.cpp | |
| parent | ac330f63fd7ac655bbd06ce5d4ed65430aa2f42a (diff) | |
| parent | 3ca4bb6bf7ba1367e06705da3968174ff9448d7d (diff) | |
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
# indra/newview/llpanelpeople.cpp
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index a0b56b14f0..a74622faec 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -546,6 +546,12 @@ void LLFloaterIMSessionTab::closeFloater(bool app_quitting) super::closeFloater(app_quitting); } +void LLFloaterIMSessionTab::deleteAllChildren() +{ + super::deleteAllChildren(); + mVoiceButton = NULL; +} + std::string LLFloaterIMSessionTab::appendTime() { std::string timeStr = "[" + LLTrans::getString("TimeHour") + "]:" |