diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-06 13:35:54 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-06 13:35:54 -0800 |
| commit | 9130cc471263dd982efb84136c8f79cc8e48f7e9 (patch) | |
| tree | be11bcefe3423fca99bc388e55878588ca9b501d /indra/newview/llcallfloater.h | |
| parent | 078278bf51b50ded63d5f7c4a9d99146f72aba69 (diff) | |
| parent | 327069dcb8d71e2fb603c0ddf505d692de64e461 (diff) | |
Merge from viewer2 trunk again - some fairly important fixes there.
Diffstat (limited to 'indra/newview/llcallfloater.h')
| -rw-r--r-- | indra/newview/llcallfloater.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index 8aba93fc43..2b40225906 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -88,7 +88,8 @@ private: VC_LOCAL_CHAT, VC_GROUP_CHAT, VC_AD_HOC_CHAT, - VC_PEER_TO_PEER + VC_PEER_TO_PEER, + VC_PEER_TO_PEER_AVALINE }EVoiceControls; typedef enum e_speaker_state |