diff options
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 1 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 1 | ||||
| -rw-r--r-- | indra/llinventory/llsettingswater.cpp | 1 | 
4 files changed, 5 insertions, 0 deletions
| diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt index 93a586759f..88a2c33ae0 100644 --- a/indra/llinventory/CMakeLists.txt +++ b/indra/llinventory/CMakeLists.txt @@ -59,6 +59,8 @@ add_library (llinventory ${llinventory_SOURCE_FILES})  target_link_libraries( llinventory llcommon llmath llmessage llxml )  target_include_directories( llinventory  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR}) +include(LibraryInstall) +  #add unit tests  if (LL_TESTS)      INCLUDE(LLAddBuildTest) diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index d483b33288..97979d64e3 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -461,6 +461,7 @@ bool LLSettingsBase::validate()  LLSD LLSettingsBase::settingValidation(LLSD &settings, validation_list_t &validations, bool partial)  { +    using boost::placeholders::_1, boost::placeholders::_2;      static Validator  validateName(SETTING_NAME, false, LLSD::TypeString, boost::bind(&Validator::verifyStringLength, _1, _2, 63));      static Validator  validateId(SETTING_ID, false, LLSD::TypeUUID);      static Validator  validateHash(SETTING_HASH, false, LLSD::TypeInteger); diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index e7d2887fdb..ad37b08df7 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -151,6 +151,7 @@ const F32 LLSettingsSky::DOME_RADIUS(15000.f);  namespace  { +    using boost::placeholders::_1, boost::placeholders::_2;  LLSettingsSky::validation_list_t legacyHazeValidationList()  { diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index b5d59dc497..b8946dbdba 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -318,6 +318,7 @@ LLSettingsWater::validation_list_t LLSettingsWater::validationList()      if (validation.empty())      { +        using boost::placeholders::_1, boost::placeholders::_2;          validation.push_back(Validator(SETTING_BLUR_MULTIPLIER, true, LLSD::TypeReal,              boost::bind(&Validator::verifyFloatRange, _1, _2, llsd::array(-0.5f, 0.5f))));          validation.push_back(Validator(SETTING_FOG_COLOR, true, LLSD::TypeArray, | 
