From 8ea6cc7dc235184267f265234228981d97e835f9 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Tue, 18 May 2010 14:15:52 +0300
Subject: EXT-7362 FIXED (World Map - make teleport button green)

Default value for button's attribute 'image_unselected' was overriden: image_unselected=\"PushButton_On\".

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/399/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_world_map.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 233ab2c1b2..fa5a0b77f9 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -538,6 +538,7 @@
     <button
      follows="right|bottom"
      height="23"
+     image_unselected="PushButton_On"
      label="Teleport"
      layout="topleft"
      left="25"
-- 
cgit v1.2.3


From d861768345ff531a69685b71d9e492378d10bc4c Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Tue, 18 May 2010 15:19:03 +0300
Subject: EXT-7381 FIXED (Nothing happens after clicking on some verb buttons
 of 'My Inventory' side panel)

- \"options_gear_btn\", \"trash_btn\" and \"add_btn\" now initialized using getChild of the main inventory panel (to avoid another break if the \"bottom_panel\"'s control class will be changed again from LLLayoutStack to something other, e. g. reverted back to LLPanel)
- mTrashButton member was added (which corresponds to \"trash_btn\" control) to optimize performance a little: LLPanelMainInventory::updateListCommands() updates \"trash_btn\"'s enabled state, so to avoid searching using getChild() again and again, a separate member was created.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/401/

--HG--
branch : product-engine
---
 indra/newview/llpanelmaininventory.cpp | 14 ++++++--------
 indra/newview/llpanelmaininventory.h   |  3 ++-
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 327196d9ba..5ff51b8165 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -900,14 +900,12 @@ void LLFloaterInventoryFinder::selectNoTypes(void* user_data)
 
 void LLPanelMainInventory::initListCommandsHandlers()
 {
-	mListCommands = getChild<LLPanel>("bottom_panel");
+	childSetAction("options_gear_btn", boost::bind(&LLPanelMainInventory::onGearButtonClick, this));
+	childSetAction("trash_btn", boost::bind(&LLPanelMainInventory::onTrashButtonClick, this));
+	childSetAction("add_btn", boost::bind(&LLPanelMainInventory::onAddButtonClick, this));
 
-	mListCommands->childSetAction("options_gear_btn", boost::bind(&LLPanelMainInventory::onGearButtonClick, this));
-	mListCommands->childSetAction("trash_btn", boost::bind(&LLPanelMainInventory::onTrashButtonClick, this));
-	mListCommands->childSetAction("add_btn", boost::bind(&LLPanelMainInventory::onAddButtonClick, this));
-
-	LLDragAndDropButton* trash_btn = mListCommands->getChild<LLDragAndDropButton>("trash_btn");
-	trash_btn->setDragAndDropHandler(boost::bind(&LLPanelMainInventory::handleDragAndDropToTrash, this
+	mTrashButton = getChild<LLDragAndDropButton>("trash_btn");
+	mTrashButton->setDragAndDropHandler(boost::bind(&LLPanelMainInventory::handleDragAndDropToTrash, this
 			,	_4 // BOOL drop
 			,	_5 // EDragAndDropType cargo_type
 			,	_7 // EAcceptance* accept
@@ -923,7 +921,7 @@ void LLPanelMainInventory::updateListCommands()
 {
 	bool trash_enabled = isActionEnabled("delete");
 
-	mListCommands->childSetEnabled("trash_btn", trash_enabled);
+	mTrashButton->setEnabled(trash_enabled);
 }
 
 void LLPanelMainInventory::onGearButtonClick()
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index b43e057f83..5a068373f5 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -36,6 +36,7 @@
 
 #include "llpanel.h"
 #include "llinventoryobserver.h"
+#include "lldndbutton.h"
 
 #include "llfolderview.h"
 
@@ -145,7 +146,7 @@ protected:
 	 */
 	void setUploadCostIfNeeded();
 private:
-	LLPanel*					mListCommands;
+	LLDragAndDropButton*		mTrashButton;
 	LLMenuGL*					mMenuGearDefault;
 	LLMenuGL*					mMenuAdd;
 
-- 
cgit v1.2.3