diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-09-01 19:14:41 +0300 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-09-01 19:14:41 +0300 |
| commit | 82c7366e20d8944fe39b5789b0e74ecb0c06368e (patch) | |
| tree | 563775e795f3b50a639059f4aa3a5c75fcc8ec8a /indra/newview/llsidetray.h | |
| parent | 30707973718608aefe7122ff96387cb45c447704 (diff) | |
VWR-21060 FIXED opening side tray tabs via shortcut, menu item or button outside of Side Tray.
Reviewed by Vadim Savchuk.
Diffstat (limited to 'indra/newview/llsidetray.h')
| -rw-r--r-- | indra/newview/llsidetray.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h index f0cc2c1146..f60c72e7a3 100644 --- a/indra/newview/llsidetray.h +++ b/indra/newview/llsidetray.h @@ -177,6 +177,8 @@ protected: void toggleTabButton (LLSideTrayTab* tab); + LLPanel* openChildPanel (LLSideTrayTab* tab, const std::string& panel_name, const LLSD& params); + private: // Implementation of LLDestroyClass<LLSideTray> static void destroyClass() @@ -187,15 +189,11 @@ private: } private: - - typedef std::pair<LLButton*, LLSideTrayTab*> detached_tab_t; - typedef std::map<std::string, detached_tab_t> detached_tab_map_t; - LLPanel* mButtonsPanel; typedef std::map<std::string,LLButton*> button_map_t; button_map_t mTabButtons; child_vector_t mTabs; - detached_tab_map_t mDetachedTabs; + child_vector_t mDetachedTabs; tab_order_vector_t mOriginalTabOrder; LLSideTrayTab* mActiveTab; |