diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-01 15:47:19 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-01 15:47:19 +0100 |
| commit | 4ffcfe0a5fe21dcb49d79851eb43bd5d80623e0d (patch) | |
| tree | 92961b4a9ff5cf9aabede13180a0e88eed10834d /indra/newview/llnavigationbar.h | |
| parent | cc675226bd53a4daf625e4d9e9a7f6c059ac01f3 (diff) | |
| parent | fc9958a61854313d80a562e18555d2c63cc4bfe5 (diff) | |
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; |