summaryrefslogtreecommitdiff
path: root/indra/newview/llcallfloater.h
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-01-05 15:48:53 +0200
committerIgor Borovkov <iborovkov@productengine.com>2010-01-05 15:48:53 +0200
commitd9d0a557ba42adce8d97ef618b2ba0752b3f7d48 (patch)
treeac6a55c355b788d8d89a7e3e6ec73dc2a07e1167 /indra/newview/llcallfloater.h
parent7669c07572e78b00eb93644a13d221f0eea5f2eb (diff)
parentf24c41644fa1bd252885d9ea7c671dc3ed375b39 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llcallfloater.h')
-rw-r--r--indra/newview/llcallfloater.h3
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