Second Life viewer sources 1.15.0.2

1 files changed, 14 insertions, 40 deletions

diff --git a/linden/indra/newview/llfloaterauction.cpp b/linden/indra/newview/llfloaterauction.cpp
index 8e7124a..49da8ba 100644
--- a/linden/indra/newview/llfloaterauction.cpp
+++ b/linden/indra/newview/llfloaterauction.cpp
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -76,12 +77,6 @@ LLFloaterAuction::LLFloaterAuction() :
         childSetCommitCallback("fence_check",
                 LLSavedSettingsGlue::setBOOL, (void*)"AuctionShowFence");
 
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(this, "saletype_combo");
-        if (combo)
-        {
-                combo->selectFirstItem();
-        }
-
         childSetAction("snapshot_btn", onClickSnapshot, this);
         childSetAction("ok_btn", onClickOK, this);
 }
@@ -215,28 +210,18 @@ void LLFloaterAuction::onClickSnapshot(void* data)
 void LLFloaterAuction::onClickOK(void* data)
 {
         LLFloaterAuction* self = (LLFloaterAuction*)(data);
-        bool is_auction = false;
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(self, "saletype_combo");
-        if (combo 
-                && combo->getCurrentIndex() == 0)
-        {
-                is_auction = true;
-        }
+
         if(self->mImageID.notNull())
         {
                 LLSD parcel_name = self->childGetValue("parcel_text");
 
-                // create the asset
-                if(is_auction)
-                {
-                        // only need the tga if it is an auction.
-                        LLString* name = new LLString(parcel_name.asString());
-                        gAssetStorage->storeAssetData(self->mTransactionID, LLAssetType::AT_IMAGE_TGA,
-                                                                           &auction_tga_upload_done,
-                                                                           (void*)name,
-                                                                           FALSE);
-                        self->getWindow()->incBusyCount();
-                }
+        // create the asset
+                LLString* name = new LLString(parcel_name.asString());
+                gAssetStorage->storeAssetData(self->mTransactionID, LLAssetType::AT_IMAGE_TGA,
+                                                                        &auction_tga_upload_done,
+                                                                        (void*)name,
+                                                                        FALSE);
+                self->getWindow()->incBusyCount();
 
                 LLString* j2c_name = new LLString(parcel_name.asString());
                 gAssetStorage->storeAssetData(self->mTransactionID, LLAssetType::AT_TEXTURE,
@@ -245,24 +230,13 @@ void LLFloaterAuction::onClickOK(void* data)
                                                                    FALSE);
                 self->getWindow()->incBusyCount();
 
-                if(is_auction)
-                {
-                        LLNotifyBox::showXml("UploadingAuctionSnapshot");
-                }
-                else
-                {
-                        LLNotifyBox::showXml("UploadingSnapshot");
-                }
+                LLNotifyBox::showXml("UploadingAuctionSnapshot");
+
         }
         LLMessageSystem* msg = gMessageSystem;
-        if(is_auction)
-        {
-                msg->newMessage("ViewerStartAuction");
-        }
-        else
-        {
-                msg->newMessage("ParcelGodReserveForNewbie");
-        }
+
+        msg->newMessage("ViewerStartAuction");
+
         msg->nextBlock("AgentData");
         msg->addUUID("AgentID", gAgent.getID());
         msg->addUUID("SessionID", gAgent.getSessionID());