5 files changed, 17 insertions, 8 deletions

diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index a39e2df..f63deb8 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -176,7 +176,7 @@ protected:
         LLTextureFetchWorker(LLTextureFetch* fetcher, const LLUUID& id, const LLHost& host,
                                                  F32 priority, S32 discard, S32 size);
         LLTextureFetchWorker(LLTextureFetch* fetcher, const std::string& url, const LLUUID& id, const LLHost& host,
-                                                 F32 priority, S32 discard, S32 size);
+                                                 F32 priority, S32 discard, S32 size, bool can_use_http);
 
 private:
         /*virtual*/ void startWork(S32 param); // called from addWork() (MAIN THREAD)
@@ -390,7 +390,8 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
                                                                                    const LLHost& host,  // Simulator host
                                                                                    F32 priority,                // Priority
                                                                                    S32 discard,                 // Desired discard
-                                                                                   S32 size)                    // Desired size
+                                                                                   S32 size,                    // Desired size
+                                                                                   bool can_use_http)   // Try HTTP first
         : LLWorkerClass(fetcher, "TextureFetch"),
           mState(INIT),
           mWriteToCacheState(NOT_WRITE),
@@ -422,7 +423,7 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
           mNeedsAux(FALSE),
           mHaveAllData(FALSE),
           mInLocalCache(FALSE),
-          mCanUseHTTP(true),
+          mCanUseHTTP(can_use_http),
           mHTTPFailCount(0),
           mRetryAttempt(0),
           mActiveCount(0),
@@ -1556,7 +1557,7 @@ LLTextureFetch::~LLTextureFetch()
 }
 
 bool LLTextureFetch::createRequest(const std::string& url, const LLUUID& id, const LLHost& host, F32 priority,
-                                                                   S32 w, S32 h, S32 c, S32 desired_discard, bool needs_aux)
+                                                                   S32 w, S32 h, S32 c, S32 desired_discard, bool needs_aux, bool can_use_http)
 {
         if (mDebugPause)
         {
@@ -1618,6 +1619,7 @@ bool LLTextureFetch::createRequest(const std::string& url, const LLUUID& id, con
                 worker->lockWorkMutex();
                 worker->setImagePriority(priority);
                 worker->setDesiredDiscard(desired_discard, desired_size);
+                worker->setCanUseHTTP(can_use_http);
                 worker->unlockWorkMutex();
                 if (!worker->haveWork())
                 {
@@ -1633,7 +1635,7 @@ bool LLTextureFetch::createRequest(const std::string& url, const LLUUID& id, con
         }
         else
         {
-                worker = new LLTextureFetchWorker(this, url, id, host, priority, desired_discard, desired_size);
+                worker = new LLTextureFetchWorker(this, url, id, host, priority, desired_discard, desired_size, can_use_http);
                 mRequestMap[id] = worker;
         }
         worker->mActiveCount++;
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h
index 61f76bc..5fa2d1c 100644
--- a/linden/indra/newview/lltexturefetch.h
+++ b/linden/indra/newview/lltexturefetch.h
@@ -60,7 +60,7 @@ public:
         /*virtual*/ S32 update(U32 max_time_ms);        
 
         bool createRequest(const std::string& url, const LLUUID& id, const LLHost& host, F32 priority,
-                                           S32 w, S32 h, S32 c, S32 discard, bool needs_aux);
+                                           S32 w, S32 h, S32 c, S32 discard, bool needs_aux, bool use_http);
         void deleteRequest(const LLUUID& id, bool cancel);
         bool getRequestFinished(const LLUUID& id, S32& discard_level,
                                                         LLPointer<LLImageRaw>& raw, LLPointer<LLImageRaw>& aux);
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)
         {
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index c82b68b..3bee51c 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -314,6 +314,8 @@ public:
         void        addFace(LLFace* facep) ;
         void        removeFace(LLFace* facep) ;
 
+        void        setCanUseHTTP(bool can_use_http) {mCanUseHTTP = can_use_http;};
+
         friend class LocalBitmap; // tag: vaa emerald local_asset_browser
 
 private:
@@ -418,6 +420,8 @@ private:
         typedef std::list<LLFace*> ll_face_list_t ;
         ll_face_list_t mFaceList ; //reverse pointer pointing to the faces using this image as texture
 
+        bool mCanUseHTTP; // can this image be fetched by http
+
 public:
         static const U32 sCurrentFileVersion;
         // Default textures
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d2aa3d8..7bbaf48 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -5196,6 +5196,7 @@ void LLVOAvatar::addLocalTextureStats( ETextureIndex idx, LLViewerImage* imagep,
 
 void LLVOAvatar::addBakedTextureStats( LLViewerImage* imagep, F32 pixel_area, F32 texel_area_ratio, S32 boost_level)
 {
+        imagep->setCanUseHTTP(false) ; //turn off http fetching for baked textures.
         mMaxPixelArea = llmax(pixel_area, mMaxPixelArea);
         mMinPixelArea = llmin(pixel_area, mMinPixelArea);
         imagep->addTextureStats(pixel_area / texel_area_ratio);