Second Life viewer sources 1.23.0-RC

1 files changed, 13 insertions, 10 deletions

diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index ce97716..8cd7297 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -388,10 +389,11 @@ void LLPanelGroups::leave()
                 }
                 if(i < count)
                 {
-                        LLUUID* cb_data = new LLUUID((const LLUUID&)group_id);
-                        LLStringUtil::format_map_t args;
-                        args["[GROUP]"] = gAgent.mGroups.get(i).mName;
-                        gViewerWindow->alertXml("GroupLeaveConfirmMember", args, callbackLeaveGroup, (void*)cb_data);
+                        LLSD args;
+                        args["GROUP"] = gAgent.mGroups.get(i).mName;
+                        LLSD payload;
+                        payload["group_id"] = group_id;
+                        LLNotifications::instance().add("GroupLeaveConfirmMember", args, payload, callbackLeaveGroup);
                 }
         }
 }
@@ -402,10 +404,11 @@ void LLPanelGroups::search()
 }
 
 // static
-void LLPanelGroups::callbackLeaveGroup(S32 option, void* userdata)
+bool LLPanelGroups::callbackLeaveGroup(const LLSD& notification, const LLSD& response)
 {
-        LLUUID* group_id = (LLUUID*)userdata;
-        if(option == 0 && group_id)
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        LLUUID group_id = notification["payload"]["group_id"].asUUID();
+        if(option == 0)
         {
                 LLMessageSystem* msg = gMessageSystem;
                 msg->newMessageFast(_PREHASH_LeaveGroupRequest);
@@ -413,10 +416,10 @@ void LLPanelGroups::callbackLeaveGroup(S32 option, void* userdata)
                 msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
                 msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
                 msg->nextBlockFast(_PREHASH_GroupData);
-                msg->addUUIDFast(_PREHASH_GroupID, *group_id);
+                msg->addUUIDFast(_PREHASH_GroupID, group_id);
                 gAgent.sendReliableMessage();
         }
-        delete group_id;
+        return false;
 }
 
 void LLPanelGroups::onGroupList(LLUICtrl* ctrl, void* userdata)