diff options
author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-10 17:03:48 +0200 |
---|---|---|
committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-10 17:03:48 +0200 |
commit | ebfb32f35bfeb796b4971f66bd1a9ebdf88be854 (patch) | |
tree | 12a2fd956a69147758226f49a437a137f065410f /indra/newview/llvoiceclient.h | |
parent | 15372bbc342a7b4c7a8d9b2e1bedd52655232ba7 (diff) | |
parent | 5377f8628e7f3eda9f497db1c367099ca04726d0 (diff) |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvoiceclient.h')
-rw-r--r-- | indra/newview/llvoiceclient.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index 9df96d9a52..347fae6156 100644 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -188,6 +188,7 @@ static void updatePosition(void); void setUserPTTState(bool ptt); 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 bool voiceEnabled(); void setUsePTT(bool usePTT); @@ -196,7 +197,7 @@ static void updatePosition(void); void setEarLocation(S32 loc); void setVoiceVolume(F32 volume); void setMicGain(F32 volume); - void setUserVolume(const LLUUID& id, F32 volume); // set's volume for specified agent, from 0-1 (where .5 is nominal) + void setUserVolume(const LLUUID& id, F32 volume); // sets volume for specified agent, from 0-1 (where .5 is nominal) void setLipSyncEnabled(BOOL enabled); BOOL lipSyncEnabled(); |