diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-24 14:44:48 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-24 14:44:48 -0400 |
| commit | 6daa52b3b93328506e34d6595a01d30c334897bc (patch) | |
| tree | bdbe951d06f95a1a7752d5c23950eda7bb36a9e7 /indra/llimage/llimage.h | |
| parent | 850bdf4ce335049a75e1c4f6400b627bf328a264 (diff) | |
| parent | b611324db58def7d65f4bfc721e7dc1c378b7fa3 (diff) | |
Merge branch 'develop' into maxim/viewer_2245
Diffstat (limited to 'indra/llimage/llimage.h')
| -rw-r--r-- | indra/llimage/llimage.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h index 6b14b68c78..1fb61673bd 100644 --- a/indra/llimage/llimage.h +++ b/indra/llimage/llimage.h @@ -27,10 +27,11 @@ #ifndef LL_LLIMAGE_H #define LL_LLIMAGE_H -#include "lluuid.h" -#include "llstring.h" +#include "llmutex.h" #include "llpointer.h" +#include "llstring.h" #include "lltrace.h" +#include "lluuid.h" constexpr S32 MIN_IMAGE_MIP = 2; // 4x4, only used for expand/contract power of 2 constexpr S32 MAX_IMAGE_MIP = 12; // 4096x4096 |