diff options
author | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:35:23 -0600 |
---|---|---|
committer | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:35:23 -0600 |
commit | 35b27d558caa8a719e6648e0bf3129629c1cc5fa (patch) | |
tree | 6a1d20ad270bd7df3141e91ec9ba0ff0a080a6fc /indra/llaudio/llvorbisencode.cpp | |
parent | 38c1cd2d29fa48b1a28a6ba1d7ef49ae00c9a5e0 (diff) | |
parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/llaudio/llvorbisencode.cpp')
-rwxr-xr-x[-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..100755 --- 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" |