diff options
| author | McCabe Maxsted | 2011-04-19 14:49:18 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2011-05-13 20:45:00 -0500 |
| commit | 74175a06d08c736f7fbd44a1eab2a94989215772 (patch) | |
| tree | 65892111adda7f6e9f0df7969653c50bf5010c82 /linden | |
| parent | Fixed the Vivox license prompt appearing when connecting to non-SL grids on s... (diff) | |
| download | meta-impy-74175a06d08c736f7fbd44a1eab2a94989215772.zip meta-impy-74175a06d08c736f7fbd44a1eab2a94989215772.tar.gz meta-impy-74175a06d08c736f7fbd44a1eab2a94989215772.tar.bz2 meta-impy-74175a06d08c736f7fbd44a1eab2a94989215772.tar.xz | |
Fixed vivox license appearing on other grids rather than specifically on second life login when voice is enabled.
(Partial cherry pick from commit a0902a050cc713f742990a09d2a610d4c135b7c7)
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llstartup.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index ab3a721..2104d9b 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
| @@ -1087,7 +1087,9 @@ bool idle_startup() | |||
| 1087 | // color init must be after saved settings loaded | 1087 | // color init must be after saved settings loaded |
| 1088 | init_colors(); | 1088 | init_colors(); |
| 1089 | 1089 | ||
| 1090 | if (gSavedSettings.getBOOL("VivoxLicenseAccepted") || gHippoGridManager->getConnectedGrid()->isSecondLife()) | 1090 | if (!gSavedSettings.getBOOL("EnableVoiceChat") || |
| 1091 | (gSavedSettings.getBOOL("EnableVoiceChat") && gSavedSettings.getBOOL("VivoxLicenseAccepted")) || | ||
| 1092 | !gHippoGridManager->getConnectedGrid()->isSecondLife()) | ||
| 1091 | { | 1093 | { |
| 1092 | // skipping over STATE_LOGIN_VOICE_LICENSE since we don't need it | 1094 | // skipping over STATE_LOGIN_VOICE_LICENSE since we don't need it |
| 1093 | // skipping over STATE_UPDATE_CHECK because that just waits for input | 1095 | // skipping over STATE_UPDATE_CHECK because that just waits for input |