diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-12-07 18:43:47 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-12-07 18:43:47 -0800 |
| commit | 7c69928ff8892f0cb4a3a6ad155106ebef7e1f8a (patch) | |
| tree | 98bd995bc2f059994c0ae48bcee15919d9d372b4 /indra | |
| parent | 8e912657e87549fb4d4cf05ab72d7cc4101ad066 (diff) | |
Fixups for things broken after the last merge and for the linux build.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llapp.h | 3 | ||||
| -rw-r--r-- | indra/newview/llfilepicker.h | 5 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index 72b81f382c..963ea38249 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -39,8 +39,11 @@ #include "lloptioninterface.h" // Forward declarations +template <typename Type> class LLAtomic32; +typedef LLAtomic32<U32> LLAtomicU32; class LLErrorThread; class LLLiveFile; +typedef struct siginfo siginfo_t; typedef void (*LLAppErrorHandler)(); typedef void (*LLAppChildCallback)(int pid, bool exited, int status); diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h index ab2455620f..7ecbc3db60 100644 --- a/indra/newview/llfilepicker.h +++ b/indra/newview/llfilepicker.h @@ -64,11 +64,6 @@ extern "C" { #if LL_GTK # include "gtk/gtk.h" #endif // LL_GTK - -// also mostly for Linux, for some X11-specific filepicker usability tweaks -#if LL_X11 -#include "SDL/SDL_syswm.h" -#endif } class LLFilePicker diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index f72bbb70bf..d15214ed4b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -38,10 +38,14 @@ #include "lleconomy.h" #include "llfloaterreg.h" #include "llfollowcamparams.h" +#include "llregionhandle.h" #include "llsdserialize.h" +#include "llteleportflags.h" #include "lltransactionflags.h" #include "llvfile.h" #include "llvfs.h" +#include "llxfermanager.h" +#include "mean_collision_data.h" #include "llagent.h" #include "llcallingcard.h" |