diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-15 21:50:42 +0000 |
|---|---|---|
| committer | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-15 21:50:42 +0000 |
| commit | ff52ac089f9ed67410f80fe66d0b997f0f2dafcc (patch) | |
| tree | bc0f195c198ddf3d6d338e48f79e419c246f03fa /indra/newview/lllogininstance.cpp | |
| parent | ff51d31af3d3c28e474c2831b38bbefa6f7732c5 (diff) | |
DEV-34822 viewer 1.23 merge
DEV-32649 Merge the diamondware/vivox voice code
-r124876
-r125220
Diffstat (limited to 'indra/newview/lllogininstance.cpp')
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 04e5cef62e..c58a220ee8 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -150,6 +150,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia requested_options.append("buddy-list"); requested_options.append("ui-config"); #endif + requested_options.append("voice-config"); requested_options.append("tutorial_setting"); requested_options.append("login-flags"); requested_options.append("global-textures"); |