diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2020-05-06 16:06:26 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-05-06 16:06:26 -0400 |
| commit | ca6f09292925a7bd936338cb598efb3ddc8524bf (patch) | |
| tree | 3f27e75fc8443b84e91fcac400084fd83dfed26a /indra/newview/lltexturecache.h | |
| parent | 4768d092f611576b4e4e95574e9b16192e7ced5e (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
Diffstat (limited to 'indra/newview/lltexturecache.h')
| -rw-r--r-- | indra/newview/lltexturecache.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h index 6046f2b9df..e1c752b58e 100644 --- a/indra/newview/lltexturecache.h +++ b/indra/newview/lltexturecache.h @@ -45,6 +45,11 @@ class LLTextureCache : public LLWorkerThread friend class LLTextureCacheLocalFileWorker; private: + +#if LL_WINDOWS +#pragma pack(push,1) +#endif + // Entries static const U32 sHeaderEncoderStringSize = 32; struct EntriesInfo @@ -73,7 +78,10 @@ private: U32 mTime; // seconds since 1/1/1970 }; - +#if LL_WINDOWS +#pragma pack(pop) +#endif + public: class Responder : public LLResponder |