diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 16:08:10 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 16:08:10 -0800 |
| commit | d7b55d0fa7f7f00a3811e62a9874999e9e0d0a8a (patch) | |
| tree | 27e0077e9366389bd92397f05bf8ea35203bc58e /indra/llcommon/linden_common.h | |
| parent | b10b7833ee160fa05a70922bffc191829bf0fb21 (diff) | |
| parent | be210914f4e9081f021cc1ad3b671765aba79b61 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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 |