diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-01-24 16:22:49 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-01-24 16:22:49 -0500 |
| commit | 11fe124ae96721b0d0f960732e8628fe0e2f84c4 (patch) | |
| tree | a8525988388de004be72251c0d7783a61d314888 /indra/newview/lltexturefetch.cpp | |
| parent | cebde0a32b4a8163010d9cbf5e6b3036865ed943 (diff) | |
| parent | b40fad02de170b5da179cacc22f32f5f25ffd7cb (diff) | |
merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 41bfbae86e..81bc70906d 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1183,11 +1183,6 @@ bool LLTextureFetchWorker::doWork(S32 param) } else if(!mUrl.empty() && mCanUseHTTP) { - if (!(mUrl.compare(0, 7, "http://") == 0)) - { - // *TODO:?remove this warning - llwarns << "Unknown URL Type: " << mUrl << llendl; - } setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority); mState = WAIT_HTTP_RESOURCE; } |