diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
| commit | d373dcc7cbed5fdea72c6b71a5594e4e85549b43 (patch) | |
| tree | 140e20f48db5dc4d7842f05ef2c24ef9e6fc3238 /indra/llcommon/llpreprocessor.h | |
| parent | c78f99b0b3b4b9ac99a69b63315e821d89a89a3b (diff) | |
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 4389fd3e30..6f38058439 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -42,6 +42,11 @@ #ifndef LL_LIBXUL_ENABLED #define LL_LIBXUL_ENABLED 1 #endif // def LL_LIBXUL_ENABLED +#elif LL_SOLARIS + #define LL_QUICKTIME_ENABLED 0 + #ifndef LL_LIBXUL_ENABLED + #define LL_LIBXUL_ENABLED 0 + #endif // def LL_LIBXUL_ENABLED #endif #if LL_LIBXUL_ENABLED && !defined(MOZILLA_INTERNAL_API) |