diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-01 12:33:36 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-01 12:33:36 +0100 |
| commit | af4a85009011119e7787e2b30416919117edccf9 (patch) | |
| tree | 54ca699fd2abe768c16f79effecead2b1c68cd7c /indra/newview/llpaneltopinfobar.h | |
| parent | 43d51d4548916d37ec89f38d5209e20864c4885c (diff) | |
| parent | 1a3b463af3b3b0668505f406162a7e2d3b557ee7 (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llpaneltopinfobar.h')
| -rw-r--r-- | indra/newview/llpaneltopinfobar.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/llpaneltopinfobar.h b/indra/newview/llpaneltopinfobar.h index e417a06a64..6e6fbc08ab 100644 --- a/indra/newview/llpaneltopinfobar.h +++ b/indra/newview/llpaneltopinfobar.h @@ -40,10 +40,12 @@ class LLTextBox; class LLIconCtrl; class LLParcelChangeObserver; -class LLPanelTopInfoBar : public LLPanel, public LLSingleton<LLPanelTopInfoBar> +class LLPanelTopInfoBar : public LLPanel, public LLSingleton<LLPanelTopInfoBar>, private LLDestroyClass<LLPanelTopInfoBar> { LOG_CLASS(LLPanelTopInfoBar); + friend class LLDestroyClass<LLPanelTopInfoBar>; + public: LLPanelTopInfoBar(); ~LLPanelTopInfoBar(); @@ -145,6 +147,17 @@ private: */ void setParcelInfoText(const std::string& new_text); + /** + * Implementation of LLDestroyClass<LLSideTray> + */ + static void destroyClass() + { + if (LLPanelTopInfoBar::instanceExists()) + { + LLPanelTopInfoBar::getInstance()->setEnabled(FALSE); + } + } + LLButton* mInfoBtn; LLTextBox* mParcelInfoText; LLTextBox* mDamageText; |