diff options
| author | Jiao Li <angela@lindenlab.com> | 2009-09-15 09:24:35 +0000 |
|---|---|---|
| committer | Jiao Li <angela@lindenlab.com> | 2009-09-15 09:24:35 +0000 |
| commit | f9326784941c9641ae7b455f76f5bc5953a8cae8 (patch) | |
| tree | e69a09152a75c0cb22f94107e81f8e572299dc9d /indra | |
| parent | d992d38fba5ed2a79f90583bd5d15a26f00a99ee (diff) | |
EXT-804 Preferences > General does not show the static text, or combo_box for Maturity rating -- to be reviewed
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_general.xml | 15 |
2 files changed, 18 insertions, 6 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 2dc96d1fb3..fac12d197e 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -528,25 +528,26 @@ void LLFloaterPreference::onOpen(const LLSD& key) bool canChoose = gAgent.getID().notNull() && (gAgent.isMature() || gAgent.isGodlike()); + LLComboBox* maturity_combo = getChild<LLComboBox>("maturity_desired_combobox"); + if (canChoose) { // if they're not adult or a god, they shouldn't see the adult selection, so delete it if (!gAgent.isAdult() && !gAgent.isGodlike()) { - LLComboBox* pMaturityCombo = getChild<LLComboBox>("maturity_desired_combobox"); // we're going to remove the adult entry from the combo. This obviously depends // on the order of items in the XML file, but there doesn't seem to be a reasonable // way to depend on the field in XML called 'name'. - pMaturityCombo->remove(0); + maturity_combo->remove(0); } childSetVisible("maturity_desired_combobox", true); - childSetVisible("maturity_desired_prompt", true); + childSetVisible("maturity_desired_textbox", false); } else { - childSetVisible("maturity_desired_prompt", false); + childSetText("maturity_desired_textbox", maturity_combo->getSelectedItemLabel()); childSetVisible("maturity_desired_combobox", false); } diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index 70292a38aa..f6074805c7 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -146,14 +146,25 @@ width="400"> I want to access content rated: </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="90" + name="maturity_desired_textbox" + top_pad="10" + width="400"> + </text> <combo_box control_name="PreferredMaturity" follows="left|bottom" height="18" layout="topleft" - left_delta="50" + left_delta="-10" name="maturity_desired_combobox" - top_pad="10" + top_pad="-10" width="170"> <combo_box.item label="PG, Mature and Adult" |