Merge branch 'VWR-8024' into next-merge

4 files changed, 39 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 309eb86..e8e83c6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -68,6 +68,9 @@
 
 2008-09-19  McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * linden/indra/newview/skins/default/xui/en-us/panel_groups.xml: 
+        VWR-8024: simplify group invites: invite to group from groups list.
+
         * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
         VWR-1363: Add "Return Object" to the Tools menu.
 
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index f6e226d..01624c6 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)
 {
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);
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 416f58b..02d5504 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -34,4 +34,6 @@
              label="Create..." name="Create" width="80" />

         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

              label="Search..." name="Search..." width="80" />

+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

+             label="Invite..." name="Invite..." width="80" />

 </panel>