diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-01-09 16:39:30 -0500 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-01-09 16:39:30 -0500 |
commit | cc0a4bf6acafe759baaccea65022c963373ea012 (patch) | |
tree | d4fe1f1e34b1ab0d140a37c1f80d09034824d3e8 /indra/newview/lltexturefetch.h | |
parent | 11e506f2eb979a5ddfc3ca6f9c626771ab012a78 (diff) | |
parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) |
Merge. Pull viewer-development in prior to filing DRTVWR merge request.
Diffstat (limited to 'indra/newview/lltexturefetch.h')
-rw-r--r-- | indra/newview/lltexturefetch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h index 2377a54f92..5ea3c14e1a 100644 --- a/indra/newview/lltexturefetch.h +++ b/indra/newview/lltexturefetch.h @@ -37,7 +37,9 @@ #include "lltextureinfo.h" #include "llapr.h" #include "llimageworker.h" +#include "llstat.h" #include "llcurl.h" +#include "llstat.h" #include "httprequest.h" #include "httpoptions.h" #include "httpheaders.h" |