diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 14:11:56 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 14:11:56 +0100 |
| commit | 8ab7e2d21116f7b90b8363a071515a3b68b9e58b (patch) | |
| tree | 11b0dae6e2527482aa0b94981597bc246debb61b /indra/newview/llviewermedia.h | |
| parent | 9fd6531dda19bda12ba7dc16a5b5020550711a97 (diff) | |
| parent | 5952fbca316ba1d1e4243bf5ebd6dc647e4957f4 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index bc6716697e..e829d7a5b4 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -46,12 +46,6 @@ #include "llurl.h" - -#if defined(LL_DARWIN) || (LL_WINDOWS && !LL_RELEASE_FOR_DOWNLOAD ) -#define PER_MEDIA_VOLUME -#endif - - class LLViewerMediaImpl; class LLUUID; class LLViewerMediaTexture; |