diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-02-17 19:28:34 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-02-17 19:28:34 -0500 |
| commit | 89258376ffc3d1e6d9e40a9136e4901e643187c8 (patch) | |
| tree | 71955ae12838cb282d48337f5ff37790c4b50612 /indra/newview/llsidetray.h | |
| parent | 930710ceecf32c12af5d6e416a4697f9eb9df8aa (diff) | |
| parent | 5946d84eef30caeae6dee63767fabdcf81613984 (diff) | |
Automated merge with http://pdp47.lindenlab.com/cgi-bin/hgwebdir.cgi/brad/viewer-development/
Diffstat (limited to 'indra/newview/llsidetray.h')
| -rw-r--r-- | indra/newview/llsidetray.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h index 184d78845f..c4d3c2626c 100644 --- a/indra/newview/llsidetray.h +++ b/indra/newview/llsidetray.h @@ -33,6 +33,13 @@ class LLAccordionCtrl; class LLSideTrayTab; +// Deal with LLSideTrayTab being opaque. Generic do-nothing cast... +template <class T> +T tab_cast(LLSideTrayTab* tab) { return tab; } +// specialized for implementation in presence of LLSideTrayTab definition +template <> +LLPanel* tab_cast<LLPanel*>(LLSideTrayTab* tab); + // added inheritance from LLDestroyClass<LLSideTray> to enable Side Tray perform necessary actions // while disconnecting viewer in LLAppViewer::disconnectViewer(). // LLDestroyClassList::instance().fireCallbacks() calls destroyClass method. See EXT-245. @@ -217,6 +224,9 @@ private: } private: + // Since we provide no public way to query mTabs and mDetachedTabs, give + // LLSideTrayListener friend access. + friend class LLSideTrayListener; LLPanel* mButtonsPanel; typedef std::map<std::string,LLButton*> button_map_t; button_map_t mTabButtons; |