Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable HTTP throttling for Avination as it's done serverside there

Browse Source
This commit is contained in:
Melanie
2013-04-21 03:30:27 +02:00
parent 43179bf853
commit c38eb88915
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llpanelnetwork.cpp
View File

@@ -44,6 +44,7 @@
#include "llnotificationsutil.h"
#include "llviewercontrol.h"
#include "llviewerwindow.h"
#include "hippogridmanager.h"
#include "llproxy.h"
@@ -74,6 +75,14 @@ BOOL LLPanelNetwork::postBuild()
childSetValue("connection_port_enabled", gSavedSettings.getBOOL("ConnectionPortEnabled"));
childSetValue("connection_port", (F32)gSavedSettings.getU32("ConnectionPort"));
// If in Avination, hide the texture bandwidth slider, Avination throttles server-side
if (gHippoGridManager->getConnectedGrid()->isAvination())
{
childSetVisible("text_box4", FALSE);
childSetVisible("tex_bandwidth", FALSE);
childSetVisible("text_box3", FALSE);
}
// Socks 5 proxy settings, commit callbacks
childSetCommitCallback("socks5_proxy_enabled", onCommitSocks5ProxyEnabled, this);
childSetCommitCallback("socks5_auth", onSocksAuthChanged, this);

20
indra/newview/lltexturefetch.cpp
View File

@@ -60,6 +60,7 @@
#include "llstartup.h"
#include "llsdserialize.h"
#include "llbuffer.h"
#include "hippogridmanager.h"
class AIHTTPTimeoutPolicy;
extern AIHTTPTimeoutPolicy HTTPGetResponder_timeout;
@@ -1267,11 +1268,22 @@ bool LLTextureFetchWorker::doWork(S32 param)
static const LLCachedControl<U32> max_http_requests("HTTPMaxRequests", 8);
static const LLCachedControl<U32> min_http_requests("HTTPMinRequests", 2);
static const LLCachedControl<F32> throttle_bandwidth("HTTPThrottleBandwidth", 2000);
if(((U32)mFetcher->getNumHTTPRequests() >= max_http_requests) ||
((mFetcher->getTextureBandwidth() > throttle_bandwidth) &&
((U32)mFetcher->getNumHTTPRequests() > min_http_requests)))
// Don't control http bandwidth in Avination, they do it serverside
if(!gHippoGridManager->getConnectedGrid()->isAvination())
{
return false ; //wait.
if(((U32)mFetcher->getNumHTTPRequests() >= max_http_requests) ||
((mFetcher->getTextureBandwidth() > throttle_bandwidth) &&
((U32)mFetcher->getNumHTTPRequests() > min_http_requests)))
{
return false ; //wait.
}
}
else
{
if(((U32)mFetcher->getNumHTTPRequests() >= max_http_requests))
{
return false ; //wait.
}
}
mFetcher->removeFromNetworkQueue(this, false);