diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-05-07 15:16:31 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-05-07 15:16:31 -0400 |
| commit | 74d59e7128bb02a4b49af99e44f437a736a3f62b (patch) | |
| tree | 5a5b750b47a55e8a378a871eb278d0bb8425b5c4 /indra/llcommon | |
| parent | 438a6431e418eac5a3a4e00f7adfe379994869d7 (diff) | |
Build llcorehttp as part of a viewer dependency with unit tests. This required
boost::thread and the easiest path to that was to go with the 1.48 Boost release
in the 3P tree (eliminating a fork for a modified 1.45 packaging). One unit test,
the most important one, is failing in test_httprequest but that can be attended
to later. This test issues a GET to http://localhost:2/ and that is hitting the
wire but the libcurl plumbing isn't delivering the failure, only the eventual
timeout. An unexpected change in behavior.
Diffstat (limited to 'indra/llcommon')
| -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 bdcc98e402..50db03cb6a 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -82,4 +82,8 @@ #include "llfile.h" #include "llformat.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 |