summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgrouproles.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-18 10:58:18 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-18 10:58:18 +0100
commitcd0ab5b41eda85b9cb4855f61c3f7e4ca5150797 (patch)
tree6e580ae150bc6942b393ad4bb73213c9f81fe909 /indra/newview/llpanelgrouproles.h
parent8b7563660c1d2ee7463edd24116a327b3b6553c3 (diff)
parentb6ed10e8285e4abef4f14c618186984ef4b2cf7f (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llpanelgrouproles.h')
-rw-r--r--indra/newview/llpanelgrouproles.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h
index 98cebe9882..a877402041 100644
--- a/indra/newview/llpanelgrouproles.h
+++ b/indra/newview/llpanelgrouproles.h
@@ -65,7 +65,7 @@ public:
virtual BOOL isVisibleByAgent(LLAgent* agentp);
- void handleClickSubTab();
+ bool handleSubTabSwitch(const LLSD& data);
// Checks if the current tab needs to be applied, and tries to switch to the requested tab.
BOOL attemptTransition();
@@ -93,7 +93,6 @@ protected:
LLPanelGroupTab* mRequestedTab;
LLTabContainer* mSubTabContainer;
BOOL mFirstUse;
- BOOL mIgnoreTransition;
std::string mDefaultNeedsApplyMesg;
std::string mWantApplyMesg;