diff options
| author | Richard Linden <none@none> | 2010-04-16 10:29:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-04-16 10:29:07 -0700 |
| commit | 882436ba06826a604e7a201f823ddff266fe9abd (patch) | |
| tree | b150e20162fc80875cd72fae5735e0c84db41aca /indra/newview | |
| parent | 35168862f5ecc06166fbd1a9bcd601ae2abbf75b (diff) | |
| parent | ba35fdd97c0eedb698a026f889092caa1c41b61b (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 83244edb8e..f9ca05f178 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -66,7 +66,7 @@ #include "llwindow.h" #include "llfloatertools.h" // to enable hide if build tools are up -#if defined(LL_DARWIN) || (defined(LL_WINDOW) && (! defined(LL_RELEASE_FOR_DOWNLOAD)) ) +#if defined(LL_DARWIN) || (LL_WINDOWS && !LL_RELEASE_FOR_DOWNLOAD ) #define PER_MEDIA_VOLUME #endif |