summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-07-12 19:43:15 +0800
committerErik Kundiman <erik@megapahit.org>2023-07-19 15:11:20 +0800
commit658ff1a0a14af93b96de22d3def56b93c0a5abd2 (patch)
treef34b7fdb9c82c468ece162cf54aa373fe82f5d1b /indra/newview
parent7b80e038829bb5055f20020b7960ce332af28116 (diff)
Boost since 1.76 already internally includes v5
Including v4 would cause conflicts.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lllogchat.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index ba82ff0b0f..1dd6ac9339 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -41,7 +41,9 @@
#include <boost/algorithm/string/trim.hpp>
#include <boost/algorithm/string/replace.hpp>
+#ifndef LL_USESYSTEMLIBS
#include <boost/regex/v4/match_results.hpp>
+#endif
#include <boost/foreach.hpp>
#if LL_MSVC