From bd48685d3489e14e709673d79b4516fd980398d8 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 7 Feb 2007 20:33:52 +0000 Subject: 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. --- indra/llcommon/indra_constants.h | 1 + indra/llcommon/llsd.cpp | 1 + 2 files changed, 2 insertions(+) (limited to 'indra/llcommon') 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 #include #include "../llmath/llmath.h" #include "llformat.h" -- cgit v1.2.3