diff options
author | Rider Linden <rider@lindenlab.com> | 2016-03-17 13:14:21 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-03-17 13:14:21 -0700 |
commit | b8c1976460374e743743728ef49b38ad52c453a4 (patch) | |
tree | 4f340d954ae3552d4dbb87b389d15d98d66eba51 /indra/newview/lltexturefetch.h | |
parent | 7a0fb4fece5a92627caa08622e9584a903a3fa1d (diff) | |
parent | 4aae7b51616c0963af4668442bdb5bfaba8c5044 (diff) |
Merge
Diffstat (limited to 'indra/newview/lltexturefetch.h')
-rwxr-xr-x | indra/newview/lltexturefetch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h index bf3423e6fe..072e6a3307 100755 --- a/indra/newview/lltexturefetch.h +++ b/indra/newview/lltexturefetch.h @@ -539,7 +539,7 @@ private: S32 mNbCurlRequests; S32 mNbCurlCompleted; - std::map< LLPointer<LLViewerFetchedTexture>, std::vector<S32> > mRefetchList; + std::map< LLPointer<LLViewerFetchedTexture>, std::vector<S32> > mRefetchList; // treats UI textures as normal textures std::vector< LLPointer<LLViewerFetchedTexture> > mTempTexList; S32 mTempIndex; S32 mHistoryListIndex; |