diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-03 19:36:44 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-03 19:36:44 +0000 |
| commit | d5eef2d8a6cc0d5855d68d0726565e07d46211b2 (patch) | |
| tree | 0138cd5a59971a52b20627f28af4197198f4e2f9 /indra/newview/llfloaternamedesc.cpp | |
| parent | 7b7dd4e6f61aa731ef7f9f255014f5b76d5b9fec (diff) | |
merge -r 73391:74133 maint-ui-3 -> release
Diffstat (limited to 'indra/newview/llfloaternamedesc.cpp')
| -rw-r--r-- | indra/newview/llfloaternamedesc.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp index 392696dc9c..d4c9478fdf 100644 --- a/indra/newview/llfloaternamedesc.cpp +++ b/indra/newview/llfloaternamedesc.cpp @@ -140,13 +140,6 @@ BOOL LLFloaterNameDesc::postBuild() y -= llfloor(PREVIEW_LINE_HEIGHT * 1.2f); - if (mIsAudio) - { - LLSD bitrate = gSavedSettings.getS32("AudioDefaultBitrate"); - - childSetValue("bitrate", bitrate); - } - // Cancel button childSetAction("cancel_btn", onBtnCancel, this); @@ -206,16 +199,10 @@ void LLFloaterNameDesc::onBtnOK( void* userdata ) fp->childDisable("ok_btn"); // don't allow inadvertent extra uploads - S32 bitrate = 0; - - if (fp->mIsAudio) - { - bitrate = fp->childGetValue("bitrate").asInteger(); - } upload_new_resource(fp->mFilenameAndPath, // file fp->childGetValue("name_form").asString(), fp->childGetValue("description_form").asString(), - bitrate, LLAssetType::AT_NONE, LLInventoryType::IT_NONE); + 0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE); fp->close(false); } |