diff --git a/build.sh b/build.sh
index 5c0a9e5288f..302185a9bf5 100755
--- a/build.sh
+++ b/build.sh
@@ -149,6 +149,7 @@ pre_build()
     RELEASE_CRASH_REPORTING=OFF
     HAVOK=OFF
     TESTING=OFF
+    USE_LTO=ON
     SIGNING=()
     if [[ "$variant" != *OS ]]
     then
@@ -170,6 +171,7 @@ pre_build()
       # RELEASE_CRASH_REPORTING is tuned on unconditionaly, this is fine but not for Linux as of now (due to missing breakpad/crashpad support)
       RELEASE_CRASH_REPORTING=OFF
       HAVOK=OFF
+      USE_LTO=OFF
     fi
 
     if $build_tests
@@ -202,6 +204,7 @@ pre_build()
     "$autobuild" configure --quiet -c $variant \
      ${eval_autobuild_configure_parameters:---} \
      -DLL_TESTS:BOOL="$TESTING" \
+     -DUSE_LTO:BOOL="$USE_LTO" \
      -DPACKAGE:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index dbd89118c9c..fd014841289 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -503,7 +503,7 @@ bool filter_llsd_with_template(
 *   Helpers for llsd_matches()
 *****************************************************************************/
 // raw data used for LLSD::Type lookup
-struct Data
+struct LLSDData
 {
     LLSD::Type type;
     const char* name;
@@ -534,7 +534,7 @@ class TypeLookup
     {
         LL_PROFILE_ZONE_SCOPED;
 
-        for (const Data *di(boost::begin(typedata)), *dend(boost::end(typedata)); di != dend; ++di)
+        for (const LLSDData*di(boost::begin(typedata)), *dend(boost::end(typedata)); di != dend; ++di)
         {
             mMap[di->type] = di->name;
         }