1 files changed, 3 insertions, 16 deletions

diff --git a/linden/indra/newview/llfloaternamedesc.cpp b/linden/indra/newview/llfloaternamedesc.cpp
index 54a7261..4c0cefa 100644
--- a/linden/indra/newview/llfloaternamedesc.cpp
+++ b/linden/indra/newview/llfloaternamedesc.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -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);
 }