summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-06-05 10:43:16 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-06-05 10:43:16 -0400
commit524f3b2af08c4e2a856a70d4505391c6f56d76df (patch)
tree43745aba721c208f0914666dbd0724d6f192ea89 /indra
parenta4a68c4f5e2e411ba636d25e6b07129ca5de2bb9 (diff)
SL-18837: #include <array> in several sources that need it.
It seems we're no longer implicitly inheriting <array> from some other [set of] header file[s]. Where we use std::array, bring it in explicitly.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llaudio/llaudioengine.h1
-rw-r--r--indra/newview/llenvironment.h2
-rw-r--r--indra/newview/llimview.cpp2
3 files changed, 5 insertions, 0 deletions
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h
index 0fe8b3d756..cf694cfaf4 100755
--- a/indra/llaudio/llaudioengine.h
+++ b/indra/llaudio/llaudioengine.h
@@ -30,6 +30,7 @@
#include <list>
#include <map>
+#include <array>
#include "v3math.h"
#include "v3dmath.h"
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h
index 64fd170e43..1c8a68ae02 100644
--- a/indra/newview/llenvironment.h
+++ b/indra/newview/llenvironment.h
@@ -42,6 +42,8 @@
#include <boost/signals2.hpp>
+#include <array>
+
//-------------------------------------------------------------------------
class LLViewerCamera;
class LLParcel;
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 6880cf2171..61a01d7418 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -72,6 +72,8 @@
#include "llcorehttputil.h"
#include "lluiusage.h"
+#include <array>
+
const static std::string ADHOC_NAME_SUFFIX(" Conference");
const static std::string NEARBY_P2P_BY_OTHER("nearby_P2P_by_other");