diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-10-25 13:22:13 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-10-25 16:12:13 -0700 |
| commit | 673b3309dde153fdadf7559bd16a5bb6db4723a1 (patch) | |
| tree | 726d5e38b016d1d5504c3024b0959cec00d6c9c1 /indra/newview/llimview.cpp | |
| parent | 887226c7d2462306191126cc5bfc0de96e18ad42 (diff) | |
| parent | e4d6a08941f9c4e81bda8ae14d481be5029353fd (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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"); |