diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:29:12 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:29:12 +0300 |
| commit | 47d339aa1050b7a42a8b683d93334f56c3dd0755 (patch) | |
| tree | bd18cc37b230de46543d9eea9b6127b20f2cbdff /indra/newview/llimview.cpp | |
| parent | 052be579b6bb19c5a321e4c2d8c9173bcf5b9c34 (diff) | |
| parent | 2e8e96cfbcb383a667d1b938f364f0bbafcad5b4 (diff) | |
Merge branch 'main' into DRTVWR-588-maint-W
# Conflicts:
# autobuild.xml
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"); |