diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-16 14:51:15 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-16 14:51:15 -0700 |
commit | 663d8f7870c2858956aea8ab20129fd084a96dc8 (patch) | |
tree | 5ea7eaf40a018fbabaee165cc511998c5390f181 /indra/newview/llviewermedia.h | |
parent | ba057d34cdc8fb91093aadaaad22618b6371cd0f (diff) | |
parent | 8cb7af4f73c0a703b5842a708e94d80aea26b6db (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r-- | indra/newview/llviewermedia.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index d89c81e7a7..bc6716697e 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -46,10 +46,12 @@ #include "llurl.h" -#if defined(LL_DARWIN) || (defined(LL_WINDOWS) && (! defined(LL_RELEASE_FOR_DOWNLOAD)) ) + +#if defined(LL_DARWIN) || (LL_WINDOWS && !LL_RELEASE_FOR_DOWNLOAD ) #define PER_MEDIA_VOLUME #endif + class LLViewerMediaImpl; class LLUUID; class LLViewerMediaTexture; |