diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-07-02 18:06:22 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-07-02 18:06:22 -0400 |
| commit | 8e5197a71bef5704956ed61eab03509a1cdb6f6f (patch) | |
| tree | 499fd5e906372f74a25d77331b9d5a0d9a8afef4 /indra/llcommon/linden_common.h | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
| parent | e8b0088d1a0c02bfa1f9768dc91fc3df4322adae (diff) | |
Merge 3.3.3 release with Drano HTTP library at 3.3.0
Big delta was converting the new texture debugger support code
to the new library. Viewer manifest should probably get an eyeball
before release.
Diffstat (limited to 'indra/llcommon/linden_common.h')
| -rw-r--r-- | indra/llcommon/linden_common.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h index 5cfcdab41c..f0a5603d06 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -59,4 +59,8 @@ #include "llerror.h" #include "llfile.h" +// Boost 1.45 had version 2 as the default for the filesystem library, +// 1.48 has version 3 as the default. Keep compatibility for now. +#define BOOST_FILESYSTEM_VERSION 2 + #endif |