aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatergroups.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-22 20:14:18 -0500
committerJacek Antonelli2008-09-22 20:14:18 -0500
commit6c1cde92a54ae7f0caeebdd76d764d1d9878a5a4 (patch)
tree6d6e88da1f0316e2c2542d69b1fdb768d5afe5a2 /linden/indra/newview/llfloatergroups.h
parentMerge branch 'land-tools' into next-merge (diff)
parentVWR-8024: simplify group invites: invite to group from groups list. (diff)
downloadmeta-impy-6c1cde92a54ae7f0caeebdd76d764d1d9878a5a4.zip
meta-impy-6c1cde92a54ae7f0caeebdd76d764d1d9878a5a4.tar.gz
meta-impy-6c1cde92a54ae7f0caeebdd76d764d1d9878a5a4.tar.bz2
meta-impy-6c1cde92a54ae7f0caeebdd76d764d1d9878a5a4.tar.xz
Merge branch 'VWR-8024' into next-merge
Diffstat (limited to 'linden/indra/newview/llfloatergroups.h')
-rw-r--r--linden/indra/newview/llfloatergroups.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloatergroups.h b/linden/indra/newview/llfloatergroups.h
index 5eda8ba..ad3ecac 100644
--- a/linden/indra/newview/llfloatergroups.h
+++ b/linden/indra/newview/llfloatergroups.h
@@ -110,6 +110,7 @@ protected:
110 static void onBtnLeave(void* userdata); 110 static void onBtnLeave(void* userdata);
111 static void onBtnSearch(void* userdata); 111 static void onBtnSearch(void* userdata);
112 static void onBtnVote(void* userdata); 112 static void onBtnVote(void* userdata);
113 static void onBtnInvite(void* userdata);
113 static void onDoubleClickGroup(void* userdata); 114 static void onDoubleClickGroup(void* userdata);
114 115
115 void create(); 116 void create();
@@ -119,6 +120,7 @@ protected:
119 void leave(); 120 void leave();
120 void search(); 121 void search();
121 void callVote(); 122 void callVote();
123 void invite();
122 124
123 static void callbackLeaveGroup(S32 option, void* userdata); 125 static void callbackLeaveGroup(S32 option, void* userdata);
124 126