diff options
| author | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
| commit | f9081220accfe5c197f1c567af8806bde236f946 (patch) | |
| tree | e711a74a34aa309222d28f694f02345dde305c4d /indra/newview/llsidetray.h | |
| parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
| parent | 0b3f6b3e9a1414c11ccf6011930c2eec6cf2fdd7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llsidetray.h')
| -rw-r--r-- | indra/newview/llsidetray.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h index 54652c1108..7321574681 100644 --- a/indra/newview/llsidetray.h +++ b/indra/newview/llsidetray.h @@ -120,7 +120,7 @@ public: void setVisible(BOOL visible) { - LLPanel::setVisible(visible); + if (getParent()) getParent()->setVisible(visible); } LLPanel* getButtonsPanel() { return mButtonsPanel; } @@ -141,6 +141,7 @@ public: void processTriState (); + void updateSidetrayVisibility(); protected: LLSideTrayTab* getTab (const std::string& name); @@ -153,10 +154,6 @@ protected: void toggleTabButton (LLSideTrayTab* tab); - void updateSidetrayVisibility(); - - - private: // Implementation of LLDestroyClass<LLSideTray> static void destroyClass() @@ -166,7 +163,6 @@ private: LLSideTray::getInstance()->setEnabled(FALSE); } - private: LLPanel* mButtonsPanel; |