From e08296f6dc44c1b18b1ca36a0ee7dc2f8578d84b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 18 Mar 2014 15:14:09 -0700
Subject: DD-40 : WIP : Got rid o the useless Drop Target text (not part of
 that UI)

---
 indra/newview/llfloateroutbox.cpp                  | 17 ---------
 indra/newview/llfloateroutbox.h                    |  1 -
 .../xui/en/floater_marketplace_listings.xml        | 40 ++++------------------
 3 files changed, 6 insertions(+), 52 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp
index 281e9124e7..a1661a2a94 100755
--- a/indra/newview/llfloateroutbox.cpp
+++ b/indra/newview/llfloateroutbox.cpp
@@ -666,7 +666,6 @@ LLFloaterMarketplaceListings::LLFloaterMarketplaceListings(const LLSD& key)
 , mInventoryPlaceholder(NULL)
 , mInventoryText(NULL)
 , mInventoryTitle(NULL)
-, mTopLevelDropZone(NULL)
 {
 }
 
@@ -693,8 +692,6 @@ BOOL LLFloaterMarketplaceListings::postBuild()
 	mInventoryText = mInventoryPlaceholder->getChild<LLTextBox>("marketplace_listings_inventory_placeholder_text");
 	mInventoryTitle = mInventoryPlaceholder->getChild<LLTextBox>("marketplace_listings_inventory_placeholder_title");
 
-	mTopLevelDropZone = getChild<LLPanel>("marketplace_listings_generic_drag_target");
-    
 	LLFocusableElement::setFocusReceivedCallback(boost::bind(&LLFloaterMarketplaceListings::onFocusReceived, this));
     
 	// Observe category creation to catch marketplace listings creation (moot if already existing)
@@ -900,7 +897,6 @@ void LLFloaterMarketplaceListings::updateView()
 	{
 		panel->setVisible(TRUE);
 		mInventoryPlaceholder->setVisible(FALSE);
-		mTopLevelDropZone->setVisible(TRUE);
 	}
 	else
 	{
@@ -909,9 +905,6 @@ void LLFloaterMarketplaceListings::updateView()
             panel->setVisible(FALSE);
         }
 		
-        // Show the drop zone if there is an outbox folder
-        mTopLevelDropZone->setVisible(mRootFolderId.notNull());
-        
         std::string text;
         std::string title;
         std::string tooltip;
@@ -1007,12 +1000,6 @@ BOOL LLFloaterMarketplaceListings::handleDragAndDrop(S32 x, S32 y, MASK mask, BO
 		{
 			handled = root_folder->handleDragAndDropToThisFolder(mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
 		}
-        
-		mTopLevelDropZone->setBackgroundVisible(handled && !drop && isAccepted(*accept));
-	}
-	else
-	{
-		mTopLevelDropZone->setBackgroundVisible(!pointInInventoryPanelChild);
 	}
 	
 	return handled;
@@ -1020,15 +1007,11 @@ BOOL LLFloaterMarketplaceListings::handleDragAndDrop(S32 x, S32 y, MASK mask, BO
 
 BOOL LLFloaterMarketplaceListings::handleHover(S32 x, S32 y, MASK mask)
 {
-	mTopLevelDropZone->setBackgroundVisible(FALSE);
-    
 	return LLFloater::handleHover(x, y, mask);
 }
 
 void LLFloaterMarketplaceListings::onMouseLeave(S32 x, S32 y, MASK mask)
 {
-	mTopLevelDropZone->setBackgroundVisible(FALSE);
-    
 	LLFloater::onMouseLeave(x, y, mask);
 }
 
diff --git a/indra/newview/llfloateroutbox.h b/indra/newview/llfloateroutbox.h
index 04a9f91f51..eba3e4217b 100755
--- a/indra/newview/llfloateroutbox.h
+++ b/indra/newview/llfloateroutbox.h
@@ -172,7 +172,6 @@ private:
 
 	LLUUID				mRootFolderId;
 	LLHandle<LLInventoryPanel> mInventoryPanel;
-	LLPanel *			mTopLevelDropZone;
 };
 
 #endif // LL_LLFLOATEROUTBOX_H
diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
index b212518f85..625b71645e 100755
--- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
@@ -66,40 +66,12 @@
         </panel>
     </panel>
     <panel
-        follows="bottom|left|right"
-        left="10"
-        bottom="435"
-        width="313"
-        top="370">
-      <panel
-          name="marketplace_listings_generic_drag_target"
-          mouse_opaque="false"
-          follows="all"
-          top="5"
-          left="5"
-          width="303"
-          height="25"
-          background_visible="false"
-          bg_alpha_color="EmphasisColor_35"
-          border="true"
-          bevel_style="in"
-          visible="true">
-        <text
-            type="string"
-            follows="all"
-            layout="topleft"
-            top="6"
-            height="20"
-            left="5"
-            width="293"
-            halign="center"
-            font="SansSerifMedium"
-            font_shadow="hard"
-            valign="top">
-          Drag items you want to sell
-        </text>
-      </panel>
-        <text
+      follows="bottom|left|right"
+      left="10"
+      bottom="435"
+      width="313"
+      top="370">
+      <text
         name="marketplace_status"
         type="string"
         follows="all"
-- 
cgit v1.2.3