summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorVladimir Pchelko <pchelko@productengine.com>2010-07-19 12:56:53 +0300
committerVladimir Pchelko <pchelko@productengine.com>2010-07-19 12:56:53 +0300
commit1ec9346f6a87074713624ac27f25432532d18409 (patch)
treefa36476c58bde27180c0fbc7451551cacf9d7460 /indra
parentc7549513974bdf8028824135bd017c7ea390ea77 (diff)
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
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpaneleditwearable.cpp9
-rw-r--r--indra/newview/llpaneleditwearable.h2
2 files changed, 11 insertions, 0 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;