summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsessiontab.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-08-14 20:52:00 +0800
committerErik Kundiman <erik@megapahit.org>2024-08-14 20:52:00 +0800
commitce8cb73ac37ce59a76c3ebfa684e8f1c94e8fd13 (patch)
tree39237632c23f093b2ea9b0490b0a19cb2dee99e9 /indra/newview/llfloaterimsessiontab.cpp
parentf58cc7facb14ff6b6763652b433524e85a728cc3 (diff)
parentab86e77818e76bdf3ef660b9fa964217265be3e7 (diff)
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
-rw-r--r--indra/newview/llfloaterimsessiontab.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 0ed84c381f..081288fae5 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") + "]:"