Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.

svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8

1 files changed, 2 insertions, 5 deletions

diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 6f8d161001..b1b464b4e4 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -216,8 +216,7 @@ BOOL LLPanelGroupGeneral::postBuild()
 	}
 
 	mIncompleteMemberDataStr = getString("incomplete_member_data_str");
-	mConfirmGroupCreateStr = getString("confirm_group_create_str");
-
+	
 	// If the group_id is null, then we are creating a new group
 	if (mGroupID.isNull())
 	{
@@ -450,9 +449,7 @@ bool LLPanelGroupGeneral::apply(std::string& mesg)
 				return false;
 			}
 
-			LLSD args;
-			args["MESSAGE"] = mConfirmGroupCreateStr;
-			LLNotifications::instance().add("GenericAlertYesCancel", args, LLSD(), boost::bind(&LLPanelGroupGeneral::createGroupCallback, this, _1, _2));
+			LLNotifications::instance().add("CreateGroupCost",  LLSD(), LLSD(), boost::bind(&LLPanelGroupGeneral::createGroupCallback, this, _1, _2));
 
 			return false;
 		}