From b52d2a2f1b0406becb80862686be7b6f2444006d Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Wed, 3 Feb 2010 22:16:18 +0200 Subject: Fixed normal bug EXT-4648 (Right segment of Speak button is disabled if nearby voice chat is disabled in estate). - Added methods for separate enabling of left and right parts of speak button and used them instead of simply enabling/disabling LLSpeakButton in bottomtray. - Made changes to reset() in LLCallFloater to show "no one near..." instead of "loading" in vcp for nearby chat in regions with disabled voice. --HG-- branch : product-engine --- indra/newview/llcallfloater.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llcallfloater.h') diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index 766191379b..dac4390fa7 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -220,7 +220,7 @@ private: * * Clears all data from the latest voice session. */ - void reset(); + void reset(const LLVoiceChannel::EState& new_state); private: speaker_state_map_t mSpeakerStateMap; -- cgit v1.2.3