From 0114be2c155ed5a3de17f6b49d06fab607b9d6bf Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 1 Nov 2024 01:29:06 +0200 Subject: viewer#2985 Odd crash when notifying voice observers Crash points at enableDisableCallBtn, but button's floater was cleaned earlier and has a removeObserver call so an observer record should be long gone. Likely something else is going on. Went over various callbacks and made sure they are cleaned. But in case floater somehow remained, added mSession = nullptr. --- indra/newview/llvoiceclient.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llvoiceclient.h') diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index d53f512d82..788ea3b3b3 100644 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -438,7 +438,7 @@ public: bool getUserPTTState(); void toggleUserPTTState(void); void inputUserControlState(bool down); // interpret any sort of up-down mic-open control input according to ptt-toggle prefs - void setVoiceEnabled(bool enabled); + static void setVoiceEnabled(bool enabled); void setUsePTT(bool usePTT); void setPTTIsToggle(bool PTTIsToggle); @@ -519,6 +519,7 @@ protected: LLPumpIO *m_servicePump; boost::signals2::connection mSimulatorFeaturesReceivedSlot; + boost::signals2::connection mRegionChangedCallbackSlot; LLCachedControl mVoiceEffectEnabled; LLCachedControl mVoiceEffectDefault; -- cgit v1.2.3