From ad332810078a0bbb8fa08fcbfdf3d756de6914f6 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 6 Jun 2008 22:43:38 +0000 Subject: QAR-650 - Viewer RC 9 merge -> release (post cmake) merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release --- indra/newview/llvoiceclient.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llvoiceclient.h') diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index 3ac5f0cdbf..8c3637830d 100644 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -210,8 +210,8 @@ class LLVoiceClient: public LLSingleton 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(); + void setLipSyncEnabled(BOOL enabled); + BOOL lipSyncEnabled(); // PTT key triggering void keyDown(KEY key, MASK mask); @@ -518,7 +518,7 @@ class LLVoiceClient: public LLSingleton LLTimer mUpdateTimer; - U32 mLipSyncEnabled; + BOOL mLipSyncEnabled; typedef std::set observer_set_t; observer_set_t mObservers; -- cgit v1.2.3