summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroup.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-10 14:51:39 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-10 14:51:39 +0000
commit56d43b9c79ede83c563c4d6d1f60ea831926e1ac (patch)
tree9ae0595dfdbbd4ff22a93f2e48ad49e1060ca802 /indra/newview/llpanelgroup.h
parenta4ef5e2b0d4e36aa98f2e4074f4ddd4cad3d3106 (diff)
parent15825cb8992ce692172907714c7cd64a48ed5fa4 (diff)
merge from viewer2 trunk.
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