diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-18 14:55:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-18 14:55:28 -0400 |
| commit | ed2b5da8f1eb51e747f6d9f5a4fc535cbf7e69d9 (patch) | |
| tree | 1971a71e793087d45501a4f291931725bb4e1753 /indra/llaudio/llvorbisencode.cpp | |
| parent | f16472976ec4fe0908753e2708df26f8d7a92348 (diff) | |
| parent | adfa7d49de6d58671bc7121483e306a9f6d705ed (diff) | |
merge changes for DRTVWR-298
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" |