summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaternamedesc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaternamedesc.cpp')
-rw-r--r--indra/newview/llfloaternamedesc.cpp15
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);
}