diff options
| author | thickbrick | 2010-10-16 16:03:31 +0200 |
|---|---|---|
| committer | McCabe Maxsted | 2010-10-16 17:33:00 -0700 |
| commit | 38ce38ef4e90d309ef40cc1f61e012853453ddfb (patch) | |
| tree | 9dbb9caad1ea01cad2b440fdab9f081405836c44 /linden | |
| parent | Port of SNOW-802: Use UDP for baked textures. (diff) | |
| download | meta-impy-38ce38ef4e90d309ef40cc1f61e012853453ddfb.zip meta-impy-38ce38ef4e90d309ef40cc1f61e012853453ddfb.tar.gz meta-impy-38ce38ef4e90d309ef40cc1f61e012853453ddfb.tar.bz2 meta-impy-38ce38ef4e90d309ef40cc1f61e012853453ddfb.tar.xz | |
More SNOW-802: disable http for bakes earlier.
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llviewerimage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp index 4f23a05..671a359 100644 --- a/linden/indra/newview/llviewerimage.cpp +++ b/linden/indra/newview/llviewerimage.cpp | |||
| @@ -256,6 +256,10 @@ LLViewerImage::LLViewerImage(const LLUUID& id, const LLHost& host, BOOL usemipma | |||
| 256 | { | 256 | { |
| 257 | init(true); | 257 | init(true); |
| 258 | sImageCount++; | 258 | sImageCount++; |
| 259 | if (host != LLHost::invalid) | ||
| 260 | { | ||
| 261 | mCanUseHTTP = false; // this is a baked texture | ||
| 262 | } | ||
| 259 | } | 263 | } |
| 260 | 264 | ||
| 261 | LLViewerImage::LLViewerImage(const std::string& url, const LLUUID& id, BOOL usemipmaps) | 265 | LLViewerImage::LLViewerImage(const std::string& url, const LLUUID& id, BOOL usemipmaps) |