diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:31:05 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:31:05 +0300 |
commit | 98a431bd16e0e06f8f83b93fd232363403c6463b (patch) | |
tree | 0e0bc8bc1c5ab18fda8ff5ba948c13b530c8a6cf /indra/llinventory | |
parent | 69aa02d2e1873970302942487b96d3a6aca119e5 (diff) | |
parent | 2e8e96cfbcb383a667d1b938f364f0bbafcad5b4 (diff) |
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# indra/newview/llinventorygallery.cpp
Diffstat (limited to 'indra/llinventory')
-rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 1 | ||||
-rw-r--r-- | indra/llinventory/llsettingssky.cpp | 1 | ||||
-rw-r--r-- | indra/llinventory/llsettingswater.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index 936b166409..6ea93e045d 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -31,6 +31,7 @@ #include <algorithm> #include "llsdserialize.h" +#include <boost/bind.hpp> //========================================================================= namespace diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index a129f0a6f0..51fca76518 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -31,6 +31,7 @@ #include "lltrace.h" #include "llfasttimer.h" #include "v3colorutil.h" +#include <boost/bind.hpp> //========================================================================= namespace diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index d732032a6c..89156000b0 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -32,6 +32,7 @@ #include "llfasttimer.h" #include "v3colorutil.h" #include "indra_constants.h" +#include <boost/bind.hpp> const std::string LLSettingsWater::SETTING_BLUR_MULTIPLIER("blur_multiplier"); const std::string LLSettingsWater::SETTING_FOG_COLOR("water_fog_color"); |