From 26163e2154647e99567b1ce01b89ed208eb11bb8 Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Wed, 25 Oct 2023 16:27:38 -0700
Subject: [PATCH] Fix DRTVWR-559 std::array usage in llrender and llprimitive
 after merge

---
 indra/llprimitive/llgltfmaterial.h | 1 +
 indra/llrender/llrender.h          | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h
index a078a530a4b..822a0aab229 100644
--- a/indra/llprimitive/llgltfmaterial.h
+++ b/indra/llprimitive/llgltfmaterial.h
@@ -34,6 +34,7 @@
 #include "lluuid.h"
 #include "hbxxh.h"
 
+#include <array>
 #include <string>
 #include <map>
 
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 98141d71f59..fd922affbab 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -44,6 +44,8 @@
 #include "llmatrix4a.h"
 #include "glh/glh_linear.h"
 
+#include <array>
+
 class LLVertexBuffer;
 class LLCubeMap;
 class LLImageGL;
-- 
GitLab