diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-04-22 16:17:22 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-04-22 16:17:22 +0000 |
| commit | c01edec021194bacb86dc9a3f5a3cc655a8cb15f (patch) | |
| tree | 51ea1eb3d76bb4af627b7b645629659eb0f0f347 /indra/newview/llvoiceclient.h | |
| parent | 06e8af59a92a1341e5ff343d49d341127d67de8c (diff) | |
QAR-468 "Babble Lipsync MergeMe"
svn merge -c85508
svn+ssh://svn.lindenlab.com/svn/linden/branches/babble-merge1-r85500
Diffstat (limited to 'indra/newview/llvoiceclient.h')
| -rw-r--r-- | indra/newview/llvoiceclient.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index 5179bc099c..3ac5f0cdbf 100644 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -210,6 +210,8 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient> 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 setVivoxDebugServerName(std::string &serverName); + void setLipSyncEnabled(U32 enabled); + U32 lipSyncEnabled(); // PTT key triggering void keyDown(KEY key, MASK mask); @@ -516,6 +518,8 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient> LLTimer mUpdateTimer; + U32 mLipSyncEnabled; + typedef std::set<LLVoiceClientParticipantObserver*> observer_set_t; observer_set_t mObservers; |