diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-19 19:59:03 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-19 19:59:03 +0800 |
| commit | 495f103000137b3288eaa05a4298fd33ceb3c2dc (patch) | |
| tree | 19b79a5cb33275a874d24e923a04de7b9657401b /indra/llinventory | |
| parent | b7a79709003b1f7f0451ba577576040fc03e50f9 (diff) | |
| parent | 0f3ffb0fad721740f20ed5c7a74f4ceade6d46b6 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingsdaycycle.cpp | 1 | ||||
| -rw-r--r-- | indra/llinventory/llsettingswater.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp index 2ff1cc74c6..99f917d94b 100644 --- a/indra/llinventory/llsettingsdaycycle.cpp +++ b/indra/llinventory/llsettingsdaycycle.cpp @@ -28,7 +28,6 @@ #include "llsettingsdaycycle.h" #include "llerror.h" #include <algorithm> -#include <boost/make_shared.hpp> #include "lltrace.h" #include "llfasttimer.h" #include "v3colorutil.h" diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index 84542e2cb4..a6a25b0953 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -27,7 +27,6 @@ #include "llsettingswater.h" #include <algorithm> -#include <boost/make_shared.hpp> #include "lltrace.h" #include "llfasttimer.h" #include "v3colorutil.h" |