diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-14 01:45:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-14 01:45:59 +0000 |
| commit | 98fd90ddd6595f2ee7e626c14117f51def621ec5 (patch) | |
| tree | 9a9caf8bffa53b753fe850f445bd133195e9bb03 /indra/llcommon | |
| parent | 89d938efe371645756240da72f4c359c36985060 (diff) | |
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media
Sam made me do it.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 4 | ||||
| -rw-r--r-- | indra/llcommon/llclickaction.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 27 |
3 files changed, 6 insertions, 27 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index 0195893b16..46f46e2433 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -323,6 +323,10 @@ const U32 PARCEL_MEDIA_COMMAND_TIME = 6; const U32 PARCEL_MEDIA_COMMAND_AGENT = 7; const U32 PARCEL_MEDIA_COMMAND_UNLOAD = 8; const U32 PARCEL_MEDIA_COMMAND_AUTO_ALIGN = 9; +const U32 PARCEL_MEDIA_COMMAND_TYPE = 10; +const U32 PARCEL_MEDIA_COMMAND_SIZE = 11; +const U32 PARCEL_MEDIA_COMMAND_DESC = 12; +const U32 PARCEL_MEDIA_COMMAND_LOOP_SET = 13; // map item types const U32 MAP_ITEM_TELEHUB = 0x01; diff --git a/indra/llcommon/llclickaction.h b/indra/llcommon/llclickaction.h index be343c6785..e2ba02465d 100644 --- a/indra/llcommon/llclickaction.h +++ b/indra/llcommon/llclickaction.h @@ -39,5 +39,7 @@ const U8 CLICK_ACTION_SIT = 1; const U8 CLICK_ACTION_BUY = 2; const U8 CLICK_ACTION_PAY = 3; const U8 CLICK_ACTION_OPEN = 4; +const U8 CLICK_ACTION_PLAY = 5; +const U8 CLICK_ACTION_OPEN_MEDIA = 6; #endif diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 459d086cda..ac06b431c1 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -52,33 +52,6 @@ #define LL_FORCE_INLINE __forceinline #endif -// Per-OS feature switches. - -#if LL_DARWIN - #define LL_QUICKTIME_ENABLED 1 - #define LL_LIBXUL_ENABLED 1 -#elif LL_WINDOWS - #define LL_QUICKTIME_ENABLED 1 - #define LL_LIBXUL_ENABLED 1 -#elif LL_LINUX - #define LL_QUICKTIME_ENABLED 0 - #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) - // Without this, nsTAString.h errors out with: - // "Cannot use internal string classes without MOZILLA_INTERNAL_API defined. Use the frozen header nsStringAPI.h instead." - // It might be worth our while to figure out if we can use the frozen apis at some point... - #define MOZILLA_INTERNAL_API 1 -#endif - // Figure out differences between compilers #if defined(__GNUC__) #define GCC_VERSION (__GNUC__ * 10000 \ |