diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-04 16:46:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-04 16:46:00 +0000 |
| commit | f8511d77a70bea452cde7270b47044358e58427c (patch) | |
| tree | 7772dd518136c7f466693f26db437ed1cf23caa6 /indra/newview/llviewermenufile.cpp | |
| parent | 90aa2ddb2efede12f12011fc163e3007e3ba7104 (diff) | |
EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 13ff55ce1c..291e3da13d 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -596,15 +596,9 @@ void upload_new_resource(const LLString& src_filename, std::string name, asset_type = LLAssetType::AT_SOUND; // tag it as audio S32 encode_result = 0; - S32 bitrate = 128; + llinfos << "Attempting to encode wav as an ogg file" << llendl; - if (compression_info) - { - bitrate = compression_info; - } - llinfos << "Attempting to encode wav as an ogg file at " << bitrate << "kbps" << llendl; - - encode_result = encode_vorbis_file_at(src_filename.c_str(), filename.c_str(), bitrate*1000); + encode_result = encode_vorbis_file(src_filename.c_str(), filename.c_str()); if (LLVORBISENC_NOERR != encode_result) { |