diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-02-03 22:16:18 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-02-03 22:16:18 +0200 |
| commit | b52d2a2f1b0406becb80862686be7b6f2444006d (patch) | |
| tree | dfcefbe6d3106f323b65f5cb9ac0b8836c717825 /indra/newview/llcallfloater.h | |
| parent | a1c3d608199a888584ce8d2172905175fcbd1796 (diff) | |
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
Diffstat (limited to 'indra/newview/llcallfloater.h')
| -rw-r--r-- | indra/newview/llcallfloater.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |