summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelimcontrolpanel.h
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-11-04 17:04:17 -0800
committerPalmer <palmer@lindenlab.com>2009-11-04 17:04:17 -0800
commitd5cceb9d2f05ba4e19da3cc50ef273aa4dffc453 (patch)
treede0a6cf70ec27964f2b08040c9f217114bd49fa4 /indra/newview/llpanelimcontrolpanel.h
parentc4817c4e5856577ff56f34ba48e12cef5ee7ab6d (diff)
parent71dc13aac99458989776e93c38294f507074fce4 (diff)
Almost automated merge
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.h')
-rw-r--r--indra/newview/llpanelimcontrolpanel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h
index d25f33935a..fa101f4280 100644
--- a/indra/newview/llpanelimcontrolpanel.h
+++ b/indra/newview/llpanelimcontrolpanel.h
@@ -73,6 +73,8 @@ private:
void onViewProfileButtonClicked();
void onAddFriendButtonClicked();
void onShareButtonClicked();
+ void onTeleportButtonClicked();
+ void onPayButtonClicked();
LLUUID mAvatarID;
};
@@ -97,6 +99,7 @@ protected:
private:
void onGroupInfoButtonClicked();
+ void onSortMenuItemClicked(const LLSD& userdata);
};
class LLPanelAdHocControlPanel : public LLPanelGroupControlPanel