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, 32 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index c0ea9df..39f6b7a 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -39,6 +39,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llfloatergroups.h"
+#include "llfloatergroupinvite.h"
 
 #include "message.h"
 #include "roles_constants.h"
@@ -223,6 +224,8 @@ BOOL LLPanelGroups::postBuild()
         childSetAction("Create", onBtnCreate, this);
 
         childSetAction("Search...", onBtnSearch, this);
+        
+        childSetAction("Invite...", onBtnInvite, this);
 
         setDefaultBtn("IM");
 
@@ -271,6 +274,14 @@ void LLPanelGroups::enableButtons()
         {
                 childDisable("Create");
         }
+        if (group_id.notNull() && gAgent.hasPowerInGroup(group_id, GP_MEMBER_INVITE))
+        {
+                LLPanelGroups::childEnable("Invite...");
+        }
+        else
+        {
+                LLPanelGroups::childDisable("Invite...");
+        }
 }
 
 
@@ -280,6 +291,12 @@ void LLPanelGroups::onBtnCreate(void* userdata)
         if(self) self->create();
 }
 
+void LLPanelGroups::onBtnInvite(void* userdata)
+{
+        LLPanelGroups* self = (LLPanelGroups*)userdata;
+        if(self) self->invite();
+}
+
 void LLPanelGroups::onBtnActivate(void* userdata)
 {
         LLPanelGroups* self = (LLPanelGroups*)userdata;
@@ -401,6 +418,21 @@ void LLPanelGroups::search()
         LLFloaterDirectory::showGroups();
 }
 
+void LLPanelGroups::invite()
+{
+        LLCtrlListInterface *group_list = childGetListInterface("group list");
+        LLUUID group_id;
+
+        //if (group_list && (group_id = group_list->getCurrentID()).notNull())
+        
+        if (group_list)
+        {
+                group_id = group_list->getCurrentID();
+        }
+
+                LLFloaterGroupInvite::showForGroup(group_id);
+}
+
 // static
 void LLPanelGroups::callbackLeaveGroup(S32 option, void* userdata)
 {