diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
| commit | e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 (patch) | |
| tree | 4be178df6b50a3395105cdd3ac0044d6467a9fa3 /indra/newview/llsidetray.h | |
| parent | d5aa10143a0e6457b3326ba839c81b7c956a015e (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llsidetray.h')
| -rw-r--r-- | indra/newview/llsidetray.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h index 7b1f4aee04..99e84f8141 100644 --- a/indra/newview/llsidetray.h +++ b/indra/newview/llsidetray.h @@ -65,7 +65,6 @@ protected: public: virtual ~LLSideTrayTab(); - void addPanel (LLPanel* panel); /*virtual*/ BOOL postBuild (); /*virtual*/ bool addChild (LLView* view, S32 tab_group); @@ -87,7 +86,7 @@ private: std::string mImagePath; std::string mDescription; - LLAccordionCtrl* mAccordionCtrl; + LLView* mMainPanel; }; @@ -163,9 +162,9 @@ public: /** * Activate tab with "panel_name" panel - * if no such tab - return false, otherwise true + * if no such tab - return NULL, otherwise a pointer to the panel */ - bool showPanel (const std::string& panel_name, const LLSD& params); + LLPanel* showPanel (const std::string& panel_name, const LLSD& params); /* * collapse SideBar, hiding visible tab and moving tab buttons @@ -209,7 +208,6 @@ protected: void createButtons (); LLButton* createButton (const std::string& name,const std::string& image,LLUICtrl::commit_callback_t callback); - void createHomeTab (); void arrange (); void reflectCollapseChange(); @@ -223,7 +221,6 @@ private: std::map<std::string,LLButton*> mTabButtons; child_vector_t mTabs; - LLSideTrayTab* mHomeTab; LLSideTrayTab* mActiveTab; LLButton* mCollapseButton; |