diff options
author | Jacek Antonelli | 2010-02-08 17:01:00 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-08 17:01:00 -0600 |
commit | d96e672c7fa0cb59ef0c30163326bb40220e745a (patch) | |
tree | 0578f6258788f44f91dbf84eebdb09d994e2a0e5 /linden/indra/llaudio | |
parent | Fixed login screen only allowing 16 chars per name. (diff) | |
download | meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.zip meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.gz meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.bz2 meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.xz |
Ported many APR changes from Snowglobe.
Diffstat (limited to 'linden/indra/llaudio')
-rw-r--r-- | linden/indra/llaudio/vorbisencode.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llaudio/vorbisencode.cpp b/linden/indra/llaudio/vorbisencode.cpp index 7df1416..57e7724 100644 --- a/linden/indra/llaudio/vorbisencode.cpp +++ b/linden/indra/llaudio/vorbisencode.cpp | |||
@@ -88,7 +88,7 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro | |||
88 | 88 | ||
89 | //******************************** | 89 | //******************************** |
90 | LLAPRFile infile ; | 90 | LLAPRFile infile ; |
91 | infile.open(in_fname,LL_APR_RB); | 91 | infile.open(in_fname,LL_APR_RB, LLAPRFile::global); |
92 | //******************************** | 92 | //******************************** |
93 | if (!infile.getFileHandle()) | 93 | if (!infile.getFileHandle()) |
94 | { | 94 | { |
@@ -232,7 +232,7 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname | |||
232 | S32 data_left = 0; | 232 | S32 data_left = 0; |
233 | 233 | ||
234 | LLAPRFile infile ; | 234 | LLAPRFile infile ; |
235 | infile.open(in_fname,LL_APR_RB); | 235 | infile.open(in_fname,LL_APR_RB, LLAPRFile::global); |
236 | if (!infile.getFileHandle()) | 236 | if (!infile.getFileHandle()) |
237 | { | 237 | { |
238 | llwarns << "Couldn't open temporary ogg file for writing: " << in_fname | 238 | llwarns << "Couldn't open temporary ogg file for writing: " << in_fname |
@@ -241,7 +241,7 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname | |||
241 | } | 241 | } |
242 | 242 | ||
243 | LLAPRFile outfile ; | 243 | LLAPRFile outfile ; |
244 | outfile.open(out_fname,LL_APR_WPB); | 244 | outfile.open(out_fname,LL_APR_WPB, LLAPRFile::global); |
245 | if (!outfile.getFileHandle()) | 245 | if (!outfile.getFileHandle()) |
246 | { | 246 | { |
247 | llwarns << "Couldn't open upload sound file for reading: " << in_fname | 247 | llwarns << "Couldn't open upload sound file for reading: " << in_fname |