diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 14:22:49 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 14:22:49 -0700 |
| commit | c139e52a5bf1ca2273d4fd22f28f55b12ba8a2d7 (patch) | |
| tree | d18b60262d24c69cb8d12d795b5dd700f4384148 /indra/newview/llvoiceclient.cpp | |
| parent | 270d13388223b641b3746000209c2c55c5fb641d (diff) | |
Remove diamondware and rearrange login panel to be like it is in the default viewer 2 build
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
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(); } |