diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:10:31 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:10:31 -0500 |
| commit | df1c6d2a2e4ccfe7bd19a66ba95c4f7bc6edee5e (patch) | |
| tree | 5d278369af1ba0ee4e75868b676b486009dbace2 /indra/newview/llviewertexturelist.cpp | |
| parent | 02783213455418a509994df16f9250b05753c183 (diff) | |
| parent | dfddccd65da32ac2c11c9106c3995a3281d7c30d (diff) | |
Automated merge from 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) |