livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed critical bug EXT-6468 (group creation process ignores group options set prior to creation). 

Submitting on behalf of Yuri Cheborarev.

Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/81/

--HG--
branch : product-engine
meow-7.2.2
Vadim Savchuk 2010-03-23 21:47:17 +02:00
parent 61d2caee9f
commit cf6b233e50
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llpanelgroupgeneral.cpp
View File

@ -820,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);
@ -934,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");

11
indra/newview/skins/default/xui/en/panel_group_general.xml
View File

@ -241,14 +241,17 @@ Hover your mouse over the options for more help.
tool_tip="Sets whether your group contains information rated as Moderate"
top_pad="4"
width="190">
<combo_item name="select_mature" value="Select">
- Select Mature -
</combo_item>
<combo_box.item
label="Moderate Content"
name="mature"
value="Mature" />
<combo_box.item
label="General Content"
name="pg"
value="Not Mature" />
<combo_box.item
label="Moderate Content"
name="mature"
value="Mature" />
</combo_box>
<check_box
follows="left|top"