1 files changed, 34 insertions, 8 deletions

diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 21b253223f..0a83ba8212 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -111,6 +111,8 @@ BOOL LLPanelGroupGeneral::postBuild()
 	{
 		mListVisibleMembers->setDoubleClickCallback(openProfile, this);
 		mListVisibleMembers->setContextMenu(LLScrollListCtrl::MENU_AVATAR);
+		
+		mListVisibleMembers->setSortCallback(boost::bind(&LLPanelGroupGeneral::sortMembersList,this,_1,_2,_3));
 	}
 
 	// Options
@@ -206,15 +208,19 @@ BOOL LLPanelGroupGeneral::postBuild()
 
 void LLPanelGroupGeneral::setupCtrls(LLPanel* panel_group)
 {
-	mInsignia = panel_group->getChild<LLTextureCtrl>("insignia");
+	mInsignia = getChild<LLTextureCtrl>("insignia");
 	if (mInsignia)
 	{
 		mInsignia->setCommitCallback(onCommitAny, this);
 		mDefaultIconID = mInsignia->getImageAssetID();
 	}
-	mFounderName = panel_group->getChild<LLNameBox>("founder_name");
+	mFounderName = getChild<LLNameBox>("founder_name");
+
+
 	mGroupNameEditor = panel_group->getChild<LLLineEditor>("group_name_editor");
-	mGroupNameEditor->setPrevalidate( LLLineEditor::prevalidateASCII );
+	mGroupNameEditor->setPrevalidate( LLTextValidate::validateASCII );
+	
+
 }
 
 // static
@@ -679,6 +685,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 
 			LLSD row;
 			row["columns"][0]["value"] = pending.str();
+			row["columns"][0]["column"] = "name";
 
 			mListVisibleMembers->setEnabled(FALSE);
 			mListVisibleMembers->addElement(row);
@@ -731,9 +738,11 @@ void LLPanelGroupGeneral::updateMembers()
 		row["columns"][1]["value"] = member->getTitle();
 		row["columns"][1]["font"]["name"] = "SANSSERIF_SMALL";
 		row["columns"][1]["font"]["style"] = style;
+
+		std::string status = member->getOnlineStatus();
 		
-		row["columns"][2]["column"] = "online";
-		row["columns"][2]["value"] = member->getOnlineStatus();
+		row["columns"][2]["column"] = "status";
+		row["columns"][2]["value"] = status;
 		row["columns"][2]["font"]["name"] = "SANSSERIF_SMALL";
 		row["columns"][2]["font"]["style"] = style;
 
@@ -811,15 +820,15 @@ void LLPanelGroupGeneral::reset()
 	
 	mCtrlListGroup->set(true);
 	
-	mCtrlReceiveNotices->setEnabled(true);
+	mCtrlReceiveNotices->setEnabled(false);
 	mCtrlReceiveNotices->setVisible(true);
 
-	mCtrlListGroup->setEnabled(true);
+	mCtrlListGroup->setEnabled(false);
 
 	mGroupNameEditor->setEnabled(TRUE);
 	mEditCharter->setEnabled(TRUE);
 
-	mCtrlShowInGroupList->setEnabled(TRUE);
+	mCtrlShowInGroupList->setEnabled(false);
 	mComboMature->setEnabled(TRUE);
 	
 	mCtrlOpenEnrollment->setEnabled(TRUE);
@@ -846,6 +855,7 @@ void LLPanelGroupGeneral::reset()
 	{
 		LLSD row;
 		row["columns"][0]["value"] = "no members yet";
+		row["columns"][0]["column"] = "name";
 
 		mListVisibleMembers->deleteAllItems();
 		mListVisibleMembers->setEnabled(FALSE);
@@ -924,6 +934,8 @@ void LLPanelGroupGeneral::setGroupID(const LLUUID& id)
 		mCtrlListGroup->setEnabled(data.mID.notNull());
 	}
 
+	mCtrlShowInGroupList->setEnabled(data.mID.notNull());
+
 	mActiveTitleLabel = getChild<LLTextBox>("active_title_label");
 	
 	mComboActiveTitle = getChild<LLComboBox>("active_title");
@@ -936,4 +948,18 @@ void LLPanelGroupGeneral::setGroupID(const LLUUID& id)
 
 	activate();
 }
+S32 LLPanelGroupGeneral::sortMembersList(S32 col_idx,const LLScrollListItem* i1,const LLScrollListItem* i2)
+{
+	const LLScrollListCell *cell1 = i1->getColumn(col_idx);
+	const LLScrollListCell *cell2 = i2->getColumn(col_idx);
+
+	if(col_idx == 2)
+	{
+		if(LLStringUtil::compareDict(cell1->getValue().asString(),"Online") == 0 )
+			return 1;
+		if(LLStringUtil::compareDict(cell2->getValue().asString(),"Online") == 0 )
+			return -1;
+	}
 
+	return LLStringUtil::compareDict(cell1->getValue().asString(), cell2->getValue().asString());
+}