diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-04 16:50:42 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-04 16:50:42 -0700 |
| commit | 4a29253a59140727334084768ebc7850d3d94eed (patch) | |
| tree | 9b177328f8db531db478109e02a11e4b3f5888e2 /indra/newview/llviewertexturelist.cpp | |
| parent | 8eda31456a0466cfa7674a881ebc69ea2abbf8a1 (diff) | |
| parent | f1b7fce1db6cd7a8f312216baaa8fada931b2579 (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 10126219f8..b5eadb6d25 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -834,7 +834,7 @@ F32 LLViewerTextureList::updateImagesFetchTextures(F32 max_time) for (entries_list_t::iterator iter3 = entries.begin(); iter3 != entries.end(); ) { - LLPointer<LLViewerFetchedTexture> imagep = *iter3++; + LLViewerFetchedTexture* imagep = *iter3++; bool fetching = imagep->updateFetch(); if (fetching) |