diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-09 14:20:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-09 14:20:04 +0800 |
| commit | 2cd3746d2cc4d895ab2662f6f165d674466db093 (patch) | |
| tree | 769eb0ed330712917a45a1b00f64140ba16faf49 /indra/newview/llenvironment.cpp | |
| parent | 43d43c79d0254b8b27f2386f67335e5f3dc5d24f (diff) | |
| parent | 735ad360d2fb64246622d53be6ece683fc121a02 (diff) | |
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 3c0a523317..5170e9a68b 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -54,8 +54,6 @@ #include "llregioninfomodel.h" -#include <boost/make_shared.hpp> - #include "llatmosphere.h" #include "llagent.h" #include "roles_constants.h" |