diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-10-26 10:01:52 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-10-26 10:01:52 +0800 |
| commit | 281ca5330e5e1b46268a0bea68af1cdb4270d512 (patch) | |
| tree | 16d00c08fe3484bdd6f2e376efeadda340e1c582 /indra/newview/llimview.cpp | |
| parent | 92fedbc11e2d69bd51660e24956984cf2503ec71 (diff) | |
| parent | 3ecce24f9f1a930f9765920a2818e5f5081d696c (diff) | |
Merge remote-tracking branch 'secondlife/DRTVWR-559' 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 2d22dc8212..2f761731b5 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -74,6 +74,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"); |