summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-20 09:40:58 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-20 09:40:58 +0100
commitef7f5889233d96d3bf59ad10a1b3208e6db791e7 (patch)
treea633237aaa0a34739956773a2ad3076489d22423
parent2c6bca70559e99731d25607003006108323f9904 (diff)
parent9e0bbcf6dd90ee4d9da15e31ee9e63ebf2dd0086 (diff)
merge from PE's viewer-public
-rw-r--r--indra/newview/llpaneleditwearable.cpp9
-rw-r--r--indra/newview/llpaneleditwearable.h2
-rw-r--r--indra/newview/llsyswellitem.cpp4
-rw-r--r--indra/newview/llsyswellitem.h1
4 files changed, 12 insertions, 4 deletions
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;
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;
};