From de9689e39beaea51db07b9ec60ddb106493b5c28 Mon Sep 17 00:00:00 2001 From: Monty Brandenberg Date: Thu, 6 Nov 2014 16:39:40 -0500 Subject: BUG-7698, BUG-7688, BUG-7694 (others) CDN connection issues. Under pipelining, requests were given a 5x timeout factor due to the way that the timeout clock works in libcurl. Under CDN load, connections were not being torn down quickly and it was only this timer that led to disconnect and retry. So, we want to break a connection that isn't making progress but that isn't immediately possible. We'll compromise with a 60S timeout that (we hope) will be neither too long for stalled connections nor too short for large asset transfer requests. --- indra/llcorehttp/_httpoprequest.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp index fbbb1614fb..7482a89dac 100755 --- a/indra/llcorehttp/_httpoprequest.cpp +++ b/indra/llcorehttp/_httpoprequest.cpp @@ -623,8 +623,23 @@ HttpStatus HttpOpRequest::prepareRequest(HttpService * service) // a handwave but bump the transfer timeout up by the pipelining // depth to give some room. // + // BUG-7698, BUG-7688, BUG-7694 (others). Scylla and Charybdis + // situation. Operating against a CDN having service issues may + // lead to requests stalling for an arbitrarily long time with only + // the CURLOPT_TIMEOUT value leading to a closed connection. Sadly + // for pipelining, libcurl (7.39.0 and earlier, at minimum) starts + // the clock on this value as soon as a request is started down + // the wire. We want a short value to recover and retry from the + // CDN. We need a long value to safely deal with a succession of + // piled-up pipelined requests. + // // *TODO: Find a better scheme than timeouts to guarantee liveness. - xfer_timeout *= cpolicy.mPipelining; + // Progress on the connection is what we really want, not timeouts. + // But we don't have access to that and the request progress indicators + // (various libcurl callbacks) have the same problem TIMEOUT does. + // + // xfer_timeout *= cpolicy.mPipelining; + xfer_timeout *= 2L; } // *DEBUG: Enable following override for timeout handling and "[curl:bugs] #1420" tests // xfer_timeout = 1L; -- cgit v1.2.3 From 4b33a395ba0d5d44fab5454ecccc054d2c83d57f Mon Sep 17 00:00:00 2001 From: eli Date: Fri, 9 Jan 2015 16:36:55 -0800 Subject: FIX MAINT-2701 restore 10 translated strings that were lost during an earlier dev merge (see Jira screenshots for details) --- indra/newview/skins/default/xui/ru/menu_viewer.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index fad1ea51e0..26e3d37918 100755 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -165,6 +165,12 @@ + + + + + + @@ -396,6 +402,12 @@ + + + + + + -- cgit v1.2.3 From 88c26487c5d2924aad429e04f50b6b4088ac4e8c Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Mon, 12 Jan 2015 12:38:06 +0200 Subject: MAINT-2560 reverted --- indra/newview/llhudeffectlookat.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'indra') diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp index fadbf78ca5..73120a0242 100755 --- a/indra/newview/llhudeffectlookat.cpp +++ b/indra/newview/llhudeffectlookat.cpp @@ -39,8 +39,6 @@ #include "llrendersphere.h" #include "llselectmgr.h" #include "llglheaders.h" -#include "llfontgl.h" -#include "llhudrender.h" #include "llxmltree.h" @@ -497,15 +495,14 @@ void LLHUDEffectLookAt::render() { gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - LLVOAvatar* source_avatar = ((LLVOAvatar*)(LLViewerObject*)mSourceObject); - LLVector3 target = mTargetPos + source_avatar->mHeadp->getWorldPosition(); + LLVector3 target = mTargetPos + ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->mHeadp->getWorldPosition(); gGL.matrixMode(LLRender::MM_MODELVIEW); gGL.pushMatrix(); gGL.translatef(target.mV[VX], target.mV[VY], target.mV[VZ]); gGL.scalef(0.3f, 0.3f, 0.3f); - LLColor3 color = (*mAttentions)[mTargetType].mColor; gGL.begin(LLRender::LINES); { + LLColor3 color = (*mAttentions)[mTargetType].mColor; gGL.color3f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE]); gGL.vertex3f(-1.f, 0.f, 0.f); gGL.vertex3f(1.f, 0.f, 0.f); @@ -517,17 +514,6 @@ void LLHUDEffectLookAt::render() gGL.vertex3f(0.f, 0.f, 1.f); } gGL.end(); gGL.popMatrix(); - - - if(!source_avatar->isSelf()) - { - std::string av_name = source_avatar->getFullname(); - const LLFontGL* big_fontp = LLFontGL::getFontSansSerif(); - gGL.pushMatrix(); - hud_render_utf8text(av_name,target+LLVector3(0.f,0.f,0.4f),*big_fontp,LLFontGL::NORMAL,LLFontGL::DROP_SHADOW_SOFT,-0.5*big_fontp->getWidthF32(av_name),3.f,color,FALSE); - gGL.popMatrix(); - } - } } -- cgit v1.2.3 From fad02b30ce61a38007c5cd450cbdd2e09464888d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 12 Jan 2015 15:08:48 -0500 Subject: increment viewer version to 3.7.25 --- indra/newview/VIEWER_VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index f36181278b..c282746153 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.7.24 +3.7.25 -- cgit v1.2.3