summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authornat-goodspeed <nat@lindenlab.com>2024-09-27 12:33:28 -0400
committerGitHub <noreply@github.com>2024-09-27 12:33:28 -0400
commit71e89d6a493e51789008f74f87439611f11c13ab (patch)
tree02d8ba63b723f3a8aeaf516d0b273cda7c71b113 /indra/llimage
parentd3833b6d618ff05f44c28eab67bc91ee5a3ba92d (diff)
parentcf2f482ceca796e587dfe2fb8df552c09156fb50 (diff)
Merge pull request #2714 from secondlife/nat/xcode-16
Clean up llpointer.h per previous discussions.
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/llimage.h5
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