diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
| commit | d4462963c6ba5db2088723bbedc7b60f1184c594 (patch) | |
| tree | 34aaba4b31f93388b0ce3b2b36e9c49823bec2cf /indra/newview/llstartup.cpp | |
| parent | b53c377727d216cb277ba14ba4c73b9b9bb96b32 (diff) | |
merge -r 58503:58641 maintenance -> release
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 282de24060..04b5fe7340 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -126,10 +126,13 @@ #include "viewer.h" #include "llmediaengine.h" #include "llfasttimerview.h" -#include "llmozlib.h" #include "llweb.h" #include "llfloaterhtml.h" +#if LL_LIBXUL_ENABLED +#include "llmozlib.h" +#endif // LL_LIBXUL_ENABLED + #if LL_WINDOWS #include "llwindebug.h" #include "lldxhardware.h" |