From c139e52a5bf1ca2273d4fd22f28f55b12ba8a2d7 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 21 Apr 2010 14:22:49 -0700 Subject: Remove diamondware and rearrange login panel to be like it is in the default viewer 2 build --- indra/newview/llvoiceclient.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'indra/newview/llvoiceclient.cpp') diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 9b311bbb81..250e366087 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -33,7 +33,6 @@ #include "llvoiceclient.h" #include "llviewercontrol.h" #include "llviewerwindow.h" -#include "llvoicedw.h" #include "llvoicevivox.h" #include "llviewernetwork.h" #include "llhttpnode.h" @@ -101,11 +100,7 @@ void LLVoiceClient::userAuthorized(const std::string& user_id, const LLUUID &age // with a table lookup of sorts. std::string voice_server = gSavedSettings.getString("VoiceServerType"); LL_DEBUGS("Voice") << "voice server type " << voice_server << LL_ENDL; - if(voice_server == "diamondware") - { - mVoiceModule = (LLVoiceModuleInterface *)LLDiamondwareVoiceClient::getInstance(); - } - else if(voice_server == "vivox") + if(voice_server == "vivox") { mVoiceModule = (LLVoiceModuleInterface *)LLVivoxVoiceClient::getInstance(); } -- cgit v1.2.3