diff options
author | McCabe Maxsted | 2011-10-17 21:12:22 -0700 |
---|---|---|
committer | McCabe Maxsted | 2011-10-17 21:12:22 -0700 |
commit | c7b0dc6733e937f8457bf50041e4ff682abb6eb4 (patch) | |
tree | d5767ece4ce3b874cafe6ec48456b2f725c1d3f3 /linden/indra/newview/llprefsvoice.cpp | |
parent | Check to make sure the version of cElementTree is really compatible with the ... (diff) | |
download | meta-impy-c7b0dc6733e937f8457bf50041e4ff682abb6eb4.zip meta-impy-c7b0dc6733e937f8457bf50041e4ff682abb6eb4.tar.gz meta-impy-c7b0dc6733e937f8457bf50041e4ff682abb6eb4.tar.bz2 meta-impy-c7b0dc6733e937f8457bf50041e4ff682abb6eb4.tar.xz |
Fixed vivox license appearing when enabling voice on opensim
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llprefsvoice.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp index 0e8e816..cb52ee0 100644 --- a/linden/indra/newview/llprefsvoice.cpp +++ b/linden/indra/newview/llprefsvoice.cpp | |||
@@ -42,6 +42,7 @@ | |||
42 | #include "llkeyboard.h" | 42 | #include "llkeyboard.h" |
43 | #include "llmodaldialog.h" | 43 | #include "llmodaldialog.h" |
44 | #include "llviewercontrol.h" | 44 | #include "llviewercontrol.h" |
45 | #include "llvoiceclient.h" | ||
45 | #include "lluictrlfactory.h" | 46 | #include "lluictrlfactory.h" |
46 | 47 | ||
47 | 48 | ||
@@ -150,7 +151,7 @@ void LLPrefsVoice::apply() | |||
150 | } | 151 | } |
151 | 152 | ||
152 | bool enable_voice = childGetValue("enable_voice_check"); | 153 | bool enable_voice = childGetValue("enable_voice_check"); |
153 | if (enable_voice && !gSavedSettings.getBOOL("VivoxLicenseAccepted")) | 154 | if (enable_voice && LLVoiceClient::needsVivoxLicense()) |
154 | { | 155 | { |
155 | // This window enables voice chat if license is accepted | 156 | // This window enables voice chat if license is accepted |
156 | FloaterVoiceLicense::getInstance()->open(); | 157 | FloaterVoiceLicense::getInstance()->open(); |