summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroup.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 11:19:51 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 11:19:51 +0000
commit44cfa948c7a8bf6786b204c35973ac879cdfc491 (patch)
treec34ec0cc9e0c73a72071463d71caa068d2af2659 /indra/newview/llpanelgroup.h
parenta4ef5e2b0d4e36aa98f2e4074f4ddd4cad3d3106 (diff)
parentfc1af768b800c890cda8ef3e8b9ee2537ca1d92a (diff)
merge.
Diffstat (limited to 'indra/newview/llpanelgroup.h')
-rw-r--r--indra/newview/llpanelgroup.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
index 6e23eedffb..136868a60d 100644
--- a/indra/newview/llpanelgroup.h
+++ b/indra/newview/llpanelgroup.h
@@ -130,6 +130,9 @@ protected:
std::vector<LLPanelGroupTab* > mTabs;
+ LLButton* mButtonJoin;
+ LLUICtrl* mJoinText;
+
};
class LLPanelGroupTab : public LLPanel