diff --git a/indra/newview/llpanelnetwork.cpp b/indra/newview/llpanelnetwork.cpp
index 86e6bced5..95b91731b 100644
--- a/indra/newview/llpanelnetwork.cpp
+++ b/indra/newview/llpanelnetwork.cpp
@@ -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);
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 289d207b8..ecbb14097 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -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);