diff options
Diffstat (limited to 'indra')
14 files changed, 14 insertions, 68 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 3abb716593..c58e98b3fb 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -145,19 +145,9 @@ void LLVoiceChannel::handleStatusChange(EStatusType type) switch(type) { case STATUS_LOGIN_RETRY: - //mLoginNotificationHandle = LLNotifyBox::showXml("VoiceLoginRetry")->getHandle(); - LLNotificationsUtil::add("VoiceLoginRetry"); + // no user notice break; case STATUS_LOGGED_IN: - //if (!mLoginNotificationHandle.isDead()) - //{ - // LLNotifyBox* notifyp = (LLNotifyBox*)mLoginNotificationHandle.get(); - // if (notifyp) - // { - // notifyp->close(); - // } - // mLoginNotificationHandle.markDead(); - //} break; case STATUS_LEFT_CHANNEL: if (callStarted() && !mIgnoreNextSessionLeave && !sSuspended) diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 842ad9ca6b..97361e3d4e 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -93,9 +93,9 @@ namespace { // Don't send positional updates more frequently than this: const F32 UPDATE_THROTTLE_SECONDS = 0.5f; - const F32 LOGIN_ATTEMPT_TIMEOUT = 5.0f; - const int LOGIN_RETRY_MAX = 5; - const F32 LOGIN_RETRY_TIMEOUT = 4.0f; + const F32 LOGIN_ATTEMPT_TIMEOUT = 30.0f; + const int LOGIN_RETRY_MAX = 3; + const F32 LOGIN_RETRY_BACKOFF = 10.0f; const int PROVISION_RETRY_MAX = 5; const F32 PROVISION_RETRY_TIMEOUT = 2.0; @@ -1061,14 +1061,10 @@ bool LLVivoxVoiceClient::loginToVivox() if ((loginresp == "retry") || (loginresp == "timeout")) { - if ((!loginRetryCount) && (loginresp != "timeout")) - { // on first retry notify user - notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_LOGIN_RETRY); - } - - if ((++loginRetryCount > LOGIN_RETRY_MAX) || (loginresp == "timeout")) + if (++loginRetryCount > LOGIN_RETRY_MAX) { - LL_WARNS("Voice") << "too many login retries or timeout connecting, giving up." << LL_ENDL; + // We've run out of retries - tell the user + LL_WARNS("Voice") << "too many login retries (" << loginRetryCount << "); giving up." << LL_ENDL; LLSD args; args["HOSTID"] = LLURI(mVoiceAccountServerURI).authority(); mTerminateDaemon = true; @@ -1082,7 +1078,7 @@ bool LLVivoxVoiceClient::loginToVivox() account_login = false; send_login = true; - F32 timeout = pow(LOGIN_RETRY_TIMEOUT, static_cast<float>(loginRetryCount)) - 1.0f; + F32 timeout = pow(LOGIN_RETRY_BACKOFF, static_cast<float>(loginRetryCount)) - 1.0f; LL_INFOS("Voice") << "will retry login in " << timeout << " seconds." << LL_ENDL; llcoro::suspendUntilTimeout(timeout); diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 513394fa9b..283a7b2a43 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -1566,9 +1566,6 @@ Klik på Acceptér for at deltage eller Afvis for at afvise invitationen. Klik p <notification name="VoiceChannelJoinFailed"> Det lykkedes ikke at forbinde til [VOICE_CHANNEL_NAME], prøv venligst igen senere. Du vil nu blive koblet til almindelig voice-chat. </notification> - <notification name="VoiceLoginRetry"> - Vi laver en stemmekanal til dig. Det kan tage op til et minut. - </notification> <notification name="VoiceEffectsExpired"> En eller flere af dine stemme "morphs" er udløbet. [[URL] Click here] for at forny dit abbonnement. diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 25e013ed90..c7ba67ccd5 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -3261,9 +3261,6 @@ Klicken Sie auf 'Akzeptieren ', um dem Chat beizutreten, oder auf &a <notification name="VoiceChannelJoinFailed"> Verbindung zu [VOICE_CHANNEL_NAME] nicht möglich. Bitte versuchen Sie es später. Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden. </notification> - <notification name="VoiceLoginRetry"> - Wir erstellen einen Voice-Kanal für Sie. Bitte warten Sie einen Moment. - </notification> <notification name="VoiceEffectsExpired"> Ein oder mehrere Ihrer Voice-Morph-Abos ist/sind abgelaufen. [[URL] Hier klicken], um Ihr Abo zu erneuern. diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 235e622852..da777417ac 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8235,17 +8235,6 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now </notification> <notification - duration="10" - icon="notifytip.tga" - name="VoiceLoginRetry" - type="notifytip"> - <unique/> -We are creating a voice channel for you. This may take up to one minute. - <tag>status</tag> - <tag>voice</tag> - </notification> - - <notification icon="notify.tga" name="VoiceEffectsExpired" sound="UISndAlert" @@ -8690,10 +8679,14 @@ We're having trouble connecting to your voice server: [HOSTID] -:UDP: 3478, 3479, 5060, 5062, 12000-17000 +Ports that must be allowed for voice are: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 -Voice communications will not be available. Please check your network and firewall setup. +Disable any SIP ALG feature in your router. + +Voice communications will not be available. <tag>voice</tag> <tag>fail</tag> <usetemplate diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index d6e686df42..2eddedf687 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -3248,9 +3248,6 @@ Pulsa Aceptar o Rehusar para coger o no la llamada. Pulsa Ignorar para ignorar a <notification name="VoiceChannelJoinFailed"> Fallo al conectar a [VOICE_CHANNEL_NAME]; por favor, inténtalo más tarde. Vas a ser reconectado al chat de voz. </notification> - <notification name="VoiceLoginRetry"> - Estamos creando un canal de voz para ti. Se puede tardar hasta un minuto. - </notification> <notification name="VoiceEffectsExpired"> Una o más de las transformaciones de voz a las que estás suscrito han caducado. [Pulsa aquí [URL]] para renovar la suscripción. diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index b7efaad376..21826a9603 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -3247,9 +3247,6 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore <notification name="VoiceChannelJoinFailed"> Échec de la connexion avec [VOICE_CHANNEL_NAME], veuillez réessayer ultérieurement. Vous allez maintenant être reconnecté(e) au chat vocal près de vous. </notification> - <notification name="VoiceLoginRetry"> - Nous sommes en train de créer un canal vocal pour vous. Veuillez patienter quelques instants. - </notification> <notification name="VoiceEffectsExpired"> Au moins l'un des effets de voix auxquels vous êtes abonné a expiré. [[URL] Cliquez ici] pour renouveler votre abonnement. diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 3621b3bc62..76579ccc13 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -3251,9 +3251,6 @@ Clicca su Accetta per unirti alla chat oppure su Declina per declinare l'in <notification name="VoiceChannelJoinFailed"> Collegamento a [VOICE_CHANNEL_NAME] non riuscito, riprova più tardi. Verrai ora ricollegato alla chat vocale nei dintorni. </notification> - <notification name="VoiceLoginRetry"> - Stiamo creando una canale voice per te. Questo può richiedere fino a un minuto. - </notification> <notification name="VoiceEffectsExpired"> Almeno una delle manipolazioni vocali alle quali sei iscritto è scaduta. [[URL] Fai clic qui] per rinnovare l'abbonamento. diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 00d9b3ca5c..51ffd5fda0 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -3291,9 +3291,6 @@ M キーを押して変更します。 <notification name="VoiceChannelJoinFailed"> [VOICE_CHANNEL_NAME] への接続に失敗しました。あとで再度お試しください。 「近くのボイスチャット」に再接続されます。 </notification> - <notification name="VoiceLoginRetry"> - ボイスチャンネルを作成しています。1 分ほどかかります。 - </notification> <notification name="VoiceEffectsExpired"> ボイスモーフィング効果の1つまたは複数の有効期限が終了しました。期限を延長・更新するには[[URL]こちらをクリック]してください。 </notification> diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index e92bdb8820..87e318be1b 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -2806,9 +2806,6 @@ Wybierz Zablokuj żeby wyciszyć tą osobę. <notification name="VoiceChannelJoinFailed"> Brak połączenia z [VOICE_CHANNEL_NAME], spróbuj później. Przełączanie do rozmowy w czacie lokalnym. </notification> - <notification name="VoiceLoginRetry"> - Tworzymy kanał głosu dla Ciebie. To może potrwać minutę. - </notification> <notification name="VoiceEffectsExpired"> Subskrypcja jednego lub więcej Przekształceń Głosu wygasła. [[URL] Kliknij tutaj] oby odnowić subskrypcję. diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 53a418a1d8..0eacff11a7 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -3236,9 +3236,6 @@ Clique em Aceitar para atender ou em Recusar para recusar este convite. Clique <notification name="VoiceChannelJoinFailed"> Falha de conexão com [VOICE_CHANNEL_NAME]. Tente novamente mais tarde. Agora você será reconectado ao bate-papo local. </notification> - <notification name="VoiceLoginRetry"> - Estamos criando uma canal de voz para você. Isto pode levar até um minuto. - </notification> <notification name="VoiceEffectsExpired"> Um ou mais serviços de distorção de voz que você assinou veceu. [[URL] Clique aqui] para renovar o serviço. diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 50931fc9b8..5f3a8571e8 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -3247,9 +3247,6 @@ http://secondlife.com/download. <notification name="VoiceChannelJoinFailed"> Не удалось подключиться к [VOICE_CHANNEL_NAME], повторите попытку позже. Будет установлено подключение к локальному голосовому чату. </notification> - <notification name="VoiceLoginRetry"> - Создается голосовой канал для вас. Создание займет не больше минуты. - </notification> <notification name="VoiceEffectsExpired"> Истек срок действия одного или нескольких типов изменения голоса, на которые вы подписаны. [[URL] Щелкните здесь], чтобы обновить подписку. diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index 0f222d49cc..7996a189e3 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -3246,9 +3246,6 @@ Sohbete katılmak için Kabul Et'i, daveti geri çevirmek için ise Reddet& <notification name="VoiceChannelJoinFailed"> [VOICE_CHANNEL_NAME] ile bağlantı kurulamadı, lütfen daha sonra tekrar deneyin. Şimdi Yakındaki bir Sesli Sohbete yeniden bağlanılacaksınız. </notification> - <notification name="VoiceLoginRetry"> - Sizin için bir ses kanalı oluşturuyoruz. Bu işlem bir dakika kadar sürebilir. - </notification> <notification name="VoiceEffectsExpired"> Abone olduğunuz Ses Şekillerinden birinin ya da daha fazlasının süresi dolmuş. Aboneliğinizi yenilemek için [[URL] burayı tıklatın]. diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 5c794afd65..61cf4e9492 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -3236,9 +3236,6 @@ SHA1 指紋：[MD5_DIGEST] <notification name="VoiceChannelJoinFailed"> 無法連通 [VOICE_CHANNEL_NAME],，請稍候再試。 現在你將重新連通到附近的語音聊天。 </notification> - <notification name="VoiceLoginRetry"> - 我們正為你建立語音頻道。 這至多可能需時一分鐘。 - </notification> <notification name="VoiceEffectsExpired"> 至少一個你訂用的變聲效果已經過期。 [[URL] 點按這裡] 繼續訂用。 |