diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
| commit | ad332810078a0bbb8fa08fcbfdf3d756de6914f6 (patch) | |
| tree | 1608b2db5d620d323673607ea7ddadfba9d58bda /indra/newview/llvoiceclient.cpp | |
| parent | a7d9a543e587ffe84b355db7a2e8193bfe6c68b6 (diff) | |
QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 4d4808cdff..b3b82d9c79 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -850,7 +850,7 @@ LLVoiceClient::LLVoiceClient() setCaptureDevice(captureDevice); std::string renderDevice = gSavedSettings.getString("VoiceOutputAudioDevice"); setRenderDevice(renderDevice); - mLipSyncEnabled = gSavedSettings.getU32("LipSyncEnabled"); + mLipSyncEnabled = gSavedSettings.getBOOL("LipSyncEnabled"); mTuningMode = false; mTuningEnergy = 0.0f; @@ -1033,13 +1033,7 @@ void LLVoiceClient::userAuthorized(const std::string& firstName, const std::stri LL_INFOS("Voice") << "name \"" << mAccountDisplayName << "\" , ID " << agentID << LL_ENDL; - std::string gridname = gGridName; - LLString::toLower(gridname); - if((gGridChoice == GRID_INFO_AGNI) || - ((gGridChoice == GRID_INFO_OTHER) && (gridname.find("agni") != std::string::npos))) - { - sConnectingToAgni = true; - } + sConnectingToAgni = LLViewerLogin::getInstance()->isInProductionGrid(); // MBW -- XXX -- Enable this when the bhd.vivox.com server gets a real ssl cert. if(sConnectingToAgni) @@ -3632,12 +3626,12 @@ bool LLVoiceClient::voiceEnabled() return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice"); } -void LLVoiceClient::setLipSyncEnabled(U32 enabled) +void LLVoiceClient::setLipSyncEnabled(BOOL enabled) { mLipSyncEnabled = enabled; } -U32 LLVoiceClient::lipSyncEnabled() +BOOL LLVoiceClient::lipSyncEnabled() { if ( mVoiceEnabled && stateDisabled != getState() ) @@ -3646,7 +3640,7 @@ U32 LLVoiceClient::lipSyncEnabled() } else { - return 0; + return FALSE; } } |