diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-04-18 15:59:22 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-04-18 15:59:22 -0700 |
| commit | eec08ef64c59fa7569c7418d40135d73338e1d8d (patch) | |
| tree | 3b62188c704df9ea16484c497d68388ab2908b80 /indra/llaudio/llvorbisencode.cpp | |
| parent | 56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (diff) | |
| parent | ed2b5da8f1eb51e747f6d9f5a4fc535cbf7e69d9 (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/llaudio/llvorbisencode.cpp')
| -rw-r--r-- | indra/llaudio/llvorbisencode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llaudio/llvorbisencode.cpp b/indra/llaudio/llvorbisencode.cpp index 0e0c80a456..dfd5da12b3 100644 --- a/indra/llaudio/llvorbisencode.cpp +++ b/indra/llaudio/llvorbisencode.cpp @@ -35,7 +35,7 @@ #include "llapr.h" //#if LL_DARWIN -// MBW -- XXX -- Getting rid of SecondLifeVorbis for now -- no fmod means no name collisions. +// MBW -- XXX -- Getting rid of SecondLifeVorbis for now #if 0 #include "VorbisFramework.h" |