From ef56e156ab8276fec7d967b6f4ab7b83baaca0bb Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Mon, 19 Jul 2010 12:56:53 +0300
Subject: EXT-7899 FIXED setVisible() was overridden IN LLPanelEditWearable to
 hide(close) LLPanelEditWearable "child" controls by calling
 "showWearable(mWearablePtr, FALSE);"

The problem was in LLPanelEditWearable "child" controls does not handle parent's setVisible() (for example - floater's).

--HG--
branch : product-engine
---
 indra/newview/llpaneleditwearable.cpp | 9 +++++++++
 indra/newview/llpaneleditwearable.h   | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 14f05bdb17..60a49c01ba 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -806,6 +806,15 @@ void LLPanelEditWearable::draw()
 	LLPanel::draw();
 }
 
+void LLPanelEditWearable::setVisible(BOOL visible)
+{
+	if (!visible)
+	{
+		showWearable(mWearablePtr, FALSE);
+	}
+	LLPanel::setVisible(visible);
+}
+
 void LLPanelEditWearable::setWearable(LLWearable *wearable)
 {
 	showWearable(mWearablePtr, FALSE);
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h
index bfce2ae56e..85b88e6185 100644
--- a/indra/newview/llpaneleditwearable.h
+++ b/indra/newview/llpaneleditwearable.h
@@ -76,6 +76,8 @@ public:
 	void				onSaveAsButtonClicked();
 	void				saveAsCallback(const LLSD& notification, const LLSD& response);
 
+	virtual void		setVisible(BOOL visible);
+
 
 private:
 	typedef std::map<F32, LLViewerVisualParam*> value_map_t;
-- 
cgit v1.2.3


From 9e0bbcf6dd90ee4d9da15e31ee9e63ebf2dd0086 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 19 Jul 2010 16:49:06 +0300
Subject: No Ticket Removed unused members in LLSysWellItem left by mistake in
 code when widget was removed from xml in 0b6a4c546d75.

This prevents a warning: 'WARNING: LLView::getChild: Making dummy class LLIconCtrl named "icon" in sys_well_item'.

Reviewed by Vadim Savchuk.

--HG--
branch : product-engine
---
 indra/newview/llsyswellitem.cpp | 4 +---
 indra/newview/llsyswellitem.h   | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/indra/newview/llsyswellitem.cpp b/indra/newview/llsyswellitem.cpp
index 0cfcfdc634..1f3d6a582d 100644
--- a/indra/newview/llsyswellitem.cpp
+++ b/indra/newview/llsyswellitem.cpp
@@ -42,14 +42,12 @@
 //---------------------------------------------------------------------------------
 LLSysWellItem::LLSysWellItem(const Params& p) : LLPanel(p),
 												mTitle(NULL),
-												mCloseBtn(NULL),
-												mIcon(NULL)
+												mCloseBtn(NULL)
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_sys_well_item.xml");
 
 	mTitle = getChild<LLTextBox>("title");
 	mCloseBtn = getChild<LLButton>("close_btn");
-	mIcon = getChild<LLIconCtrl>("icon");
 
 	mTitle->setValue(p.title);
 	mCloseBtn->setClickedCallback(boost::bind(&LLSysWellItem::onClickCloseBtn,this));
diff --git a/indra/newview/llsyswellitem.h b/indra/newview/llsyswellitem.h
index b9b00e972a..3680e50218 100644
--- a/indra/newview/llsyswellitem.h
+++ b/indra/newview/llsyswellitem.h
@@ -79,7 +79,6 @@ private:
 
 	LLTextBox*	mTitle;
 	LLButton*	mCloseBtn;
-	LLIconCtrl*	mIcon;
 	LLUUID		mID;
 };
 
-- 
cgit v1.2.3