diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-01 11:11:00 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-01 11:11:00 -0400 |
| commit | a94223b3dfb7e2a12e6ab850aac096f1d8301ad3 (patch) | |
| tree | f83023fc60578dcad06b398d53c55d283bf4d19a /indra/newview/llnavigationbar.h | |
| parent | 1cdf3146f284eb5a2c9effc6b44f060b5345f58b (diff) | |
| parent | af4a85009011119e7787e2b30416919117edccf9 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llnavigationbar.h')
| -rw-r--r-- | indra/newview/llnavigationbar.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h index b512f2a79c..03f17af09b 100644 --- a/indra/newview/llnavigationbar.h +++ b/indra/newview/llnavigationbar.h @@ -87,9 +87,10 @@ protected: * Web browser-like navigation bar. */ class LLNavigationBar - : public LLPanel, public LLSingleton<LLNavigationBar> + : public LLPanel, public LLSingleton<LLNavigationBar>, private LLDestroyClass<LLNavigationBar> { LOG_CLASS(LLNavigationBar); + friend class LLDestroyClass<LLNavigationBar>; public: LLNavigationBar(); @@ -136,6 +137,14 @@ private: void fillSearchComboBox(); + static void destroyClass() + { + if (LLNavigationBar::instanceExists()) + { + LLNavigationBar::getInstance()->setEnabled(FALSE); + } + } + LLMenuGL* mTeleportHistoryMenu; LLPullButton* mBtnBack; LLPullButton* mBtnForward; |