diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-23 21:47:17 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-23 21:47:17 +0200 |
| commit | cf6b233e50135a961a9be4e8e00c846466060bf8 (patch) | |
| tree | 3c8e3e6c3c0c4593d01ebe9ebc48935d7b9563cd /indra | |
| parent | 61d2caee9f9474a6ccb6c13a4727e3527bd7c938 (diff) | |
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
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelgroupgeneral.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_general.xml | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index 517204b232..0a83ba8212 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -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"); diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index f913c58cc9..9341d433e8 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -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="General Content" - name="pg" - value="Not Mature" /> - <combo_box.item label="Moderate Content" name="mature" value="Mature" /> + <combo_box.item + label="General Content" + name="pg" + value="Not Mature" /> </combo_box> <check_box follows="left|top" |