2 files changed, 54 insertions, 1 deletions

diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 80e3bfc..bd1812e 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -871,6 +871,16 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                         return false;
                                 }
                         }
+
+                        // *TODO: remove this hack when not needed anymore
+                        S32 buggy_range_fudge = 0;
+                        if (LLTextureFetch::hasBuggyHTTPRange())
+                        {
+                                buggy_range_fudge = 1;
+                                resetFormattedData(); // discard any previous data we had
+                                cur_size = 0 ;
+                        }
+
                         mRequestedSize = mDesiredSize;
                         mRequestedDiscard = mDesiredDiscard;
                         mRequestedSize -= cur_size;
@@ -896,7 +906,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                 // Will call callbackHttpGet when curl request completes
                                 std::vector<std::string> headers;
                                 headers.push_back("Accept: image/x-j2c");
-                                res = mFetcher->mCurlGetRequest->getByteRange(mUrl, headers, offset, mRequestedSize,
+                                res = mFetcher->mCurlGetRequest->getByteRange(mUrl, headers, offset, mRequestedSize + buggy_range_fudge,
                                                                                                                           new HTTPGetResponder(mFetcher, mID, LLTimer::getTotalTime(), mRequestedSize, offset));
                         }
                         if (!res)
@@ -2258,3 +2268,44 @@ void LLTextureFetch::dump()
         }
 }
 
+// This tries to detect if the sim has this bug:
+// http://opensimulator.org/mantis/view.php?id=5081
+//
+// *TODO: This is a *HACK and may not work if the grid is heterogenous.
+//        Remove it once OpenSim versions in the wild are > 0.7.0.2!
+#include "hippoGridManager.h"
+#include <boost/regex.hpp> 
+//static
+bool LLTextureFetch::hasBuggyHTTPRange()
+{
+        static std::string s_version;
+        static bool buggy = false;
+        if ((s_version != gLastVersionChannel) && !gLastVersionChannel.empty())
+        {
+                s_version = gLastVersionChannel;
+                buggy = true;
+                if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_OPENSIM)
+                {
+                        std::string ver_string;
+                        try
+                        {
+                                const boost::regex re(".*OpenSim.*?([0-9.]+).+");
+                                ver_string = regex_replace(s_version, re, "\\1", boost::match_default);
+                        }
+                        catch(std::runtime_error)
+                        {
+                                ver_string = "0.0";
+                        }
+                        LLStringUtil::replaceChar(ver_string, '.', '0');
+                        ver_string = "0." + ver_string;
+                        F64 version = atof(ver_string.c_str());
+                        // we look for "0.6.8" < version < "0.7.0.3"
+                        if ((version > 0.00608) && (version < 0.0070003))
+                        {
+                                buggy = true;
+                                llwarns << "Setting buggy http ranges mode for current sim, because we're on " << s_version << llendl;
+                        }
+                }
+        }
+        return buggy;
+}
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h
index 5eca0ba..61f76bc 100644
--- a/linden/indra/newview/lltexturefetch.h
+++ b/linden/indra/newview/lltexturefetch.h
@@ -86,6 +86,8 @@ public:
 
         LLTextureInfo* getTextureInfo() { return &mTextureInfo; }
         
+        static bool hasBuggyHTTPRange(); // *TODO: remove this *HACK once buggy OpenSim versions are gone
+
 protected:
         void addToNetworkQueue(LLTextureFetchWorker* worker);
         void removeFromNetworkQueue(LLTextureFetchWorker* worker, bool cancel);