merge from latest svn/viewer-2-0 to hg/viewer-2-0

1 files changed, 14 insertions, 9 deletions

diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp
index 3648898f28..45af515a86 100644
--- a/indra/newview/llfloatergroups.cpp
+++ b/indra/newview/llfloatergroups.cpp
@@ -89,15 +89,6 @@ BOOL LLFloaterGroupPicker::postBuild()
 		list_ctrl->setContextMenu(LLScrollListCtrl::MENU_GROUP);
 	}
 	
-	// Remove group "none" from list. Group "none" is added in init_group_list(). 
-	// Some UI elements use group "none", we need to manually delete it here.
-	// Group "none" ID is LLUUID:null.
-	LLCtrlListInterface* group_list = list_ctrl->getListInterface();
-	if(group_list)
-	{
-		group_list->selectByValue(LLUUID::null);
-		group_list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
-	}
 
 	childSetAction("OK", onBtnOK, this);
 
@@ -110,6 +101,20 @@ BOOL LLFloaterGroupPicker::postBuild()
 	return TRUE;
 }
 
+void LLFloaterGroupPicker::removeNoneOption()
+{
+	// Remove group "none" from list. Group "none" is added in init_group_list(). 
+	// Some UI elements use group "none", we need to manually delete it here.
+	// Group "none" ID is LLUUID:null.
+	LLCtrlListInterface* group_list = getChild<LLScrollListCtrl>("group list")->getListInterface();
+	if(group_list)
+	{
+		group_list->selectByValue(LLUUID::null);
+		group_list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
+	}
+}
+
+
 void LLFloaterGroupPicker::onBtnOK(void* userdata)
 {
 	LLFloaterGroupPicker* self = (LLFloaterGroupPicker*)userdata;