diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-23 03:51:39 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-23 03:51:39 +0200 |
| commit | 259d28cd788cb6150cffde8f11cde2887c2e3bcb (patch) | |
| tree | 5969f6504786c0752c805bc833d6aef513a8387f /indra/newview/lllocalbitmaps.cpp | |
| parent | 0c8794ef0f7985c9204551d2c6ed315ffa6ee505 (diff) | |
| parent | 3ff35b8c2b530bc7d4e6fbdeb688506b27af2d66 (diff) | |
Merge branch 'develop-linux' into marchcat/slua-linux
Diffstat (limited to 'indra/newview/lllocalbitmaps.cpp')
| -rw-r--r-- | indra/newview/lllocalbitmaps.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index 6e56aac270..a5ab5538e7 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -31,8 +31,6 @@ /* own header */ #include "lllocalbitmaps.h" -/* boost: will not compile unless equivalent is undef'd, beware. */ -#include "fix_macros.h" #include <boost/filesystem.hpp> /* image compression headers. */ |