diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2007-02-07 20:33:52 +0000 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2007-02-07 20:33:52 +0000 |
| commit | bd48685d3489e14e709673d79b4516fd980398d8 (patch) | |
| tree | d556e55f5ee0dede121d8e1c1542a837ef87dc14 /indra/llcommon | |
| parent | d0d4670f4941dcf7430fb1269c6613140ecf3ff7 (diff) | |
Fixed a linux build issue when the llhavok suddenly required rtti in order to link.
I added a #ifndef hack to v3math.h to eliminate LLString's from the llhavok project.
I also removed lluuid.h's dependency on LLString (using std::string) instead and
then fixed a bunch of bad dependency fallout on a few files around the project
that suddenly lost their hidden access to some fundamental includes.
The important parts were reviewed with James.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 1 | ||||
| -rw-r--r-- | indra/llcommon/llsd.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index b8df3cbfe7..dc84350987 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -9,6 +9,7 @@ #ifndef LL_INDRA_CONSTANTS_H #define LL_INDRA_CONSTANTS_H +#include "stdtypes.h" #include "lluuid.h" // Viewer object cache version, change if object update diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp index 45d7acd417..aa4cba99d1 100644 --- a/indra/llcommon/llsd.cpp +++ b/indra/llcommon/llsd.cpp @@ -8,6 +8,7 @@ #include "llsd.h" +#include <sstream> #include <math.h> #include "../llmath/llmath.h" #include "llformat.h" |