Updated to SL source 1.21.2.

Conflicts:
	linden/indra/SConstruct
	linden/indra/newview/files.lst
	linden/indra/newview/llfloatertools.cpp
	linden/indra/newview/llfloatertools.h
	linden/indra/newview/lloverlaybar.cpp
	linden/indra/newview/lloverlaybar.h
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
	linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
	linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
	linden/indra/newview/viewer_manifest.py

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:
         static void onBtnLeave(void* userdata);
         static void onBtnSearch(void* userdata);
         static void onBtnVote(void* userdata);
+        static void onBtnInvite(void* userdata);
         static void onDoubleClickGroup(void* userdata);
 
         void create();
@@ -119,6 +120,7 @@ protected:
         void leave();
         void search();
         void callVote();
+        void invite();
 
         static void callbackLeaveGroup(S32 option, void* userdata);