Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ pre_build()
RELEASE_CRASH_REPORTING=OFF
HAVOK=OFF
TESTING=OFF
USE_LTO=ON
SIGNING=()
if [[ "$variant" != *OS ]]
then
Expand All @@ -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
Expand Down Expand Up @@ -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" \
Expand Down
4 changes: 2 additions & 2 deletions indra/llcommon/llsdutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
Loading