Port of SNOW-802: Use UDP for baked textures.

Port of SNOW-802 from SG1. Originally ported by Robin cornelius from
SG 2.1.

Also added a paramter can_use_http to the LLTextureFetchWorker
constructor, to avoid messing with locks.

1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 400fb2f..4f23a05 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -346,6 +346,8 @@ void LLViewerImage::init(bool firstinit)
         mForceToSaveRawImage  = FALSE ;
         mSavedRawDiscardLevel = -1 ;
         mDesiredSavedRawDiscardLevel = -1 ;
+
+        mCanUseHTTP = true; //default on if cap/settings allows us
 }
 
 // virtual
@@ -1213,7 +1215,7 @@ bool LLViewerImage::updateFetch()
                 // bypass texturefetch directly by pulling from LLTextureCache
                 bool fetch_request_created = false;
                 fetch_request_created = LLAppViewer::getTextureFetch()->createRequest(mUrl, getID(),getTargetHost(), decode_priority,
-                                                                                                                                                          w, h, c, desired_discard, needsAux());
+                                                                                                                                                          w, h, c, desired_discard, needsAux(), mCanUseHTTP);
 
                 if (fetch_request_created)
                 {                               
@@ -1292,7 +1294,7 @@ BOOL LLViewerImage::forceFetch()
                 c = getComponents();
         }
         fetch_request_created = LLAppViewer::getTextureFetch()->createRequest(mUrl, getID(),getTargetHost(), maxDecodePriority(),
-                                                                                                                                                  w, h, c, desired_discard, needsAux());
+                                                                                                                                                  w, h, c, desired_discard, needsAux(), mCanUseHTTP);
 
         if (fetch_request_created)
         {