From f9326784941c9641ae7b455f76f5bc5953a8cae8 Mon Sep 17 00:00:00 2001 From: Jiao Li Date: Tue, 15 Sep 2009 09:24:35 +0000 Subject: EXT-804 Preferences > General does not show the static text, or combo_box for Maturity rating -- to be reviewed --- indra/newview/llfloaterpreference.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloaterpreference.cpp') 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("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("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); } -- cgit v1.2.3 From 34b00eeda21c9a1e124709ca3c27ae7777f0b8a0 Mon Sep 17 00:00:00 2001 From: Jiao Li Date: Tue, 22 Sep 2009 04:05:44 +0000 Subject: EXT-1015 terrain detail text not grayed out -- to be reviewed --- indra/newview/llfloaterpreference.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/newview/llfloaterpreference.cpp') diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index fac12d197e..b4f9176f9a 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -881,10 +881,20 @@ void LLFloaterPreference::refreshEnabledState() { mRadioTerrainDetail->setValue(1); mRadioTerrainDetail->setEnabled(FALSE); + for (S32 i = 0; i < mRadioTerrainDetail->getItemCount(); ++i) + { + mRadioTerrainDetail->setIndexEnabled(i, FALSE); + } } else { mRadioTerrainDetail->setEnabled(TRUE); + + for (S32 i = 0; i < mRadioTerrainDetail->getItemCount(); ++i) + { + mRadioTerrainDetail->setIndexEnabled(i, TRUE); + } + } // WindLight -- cgit v1.2.3 From 760adead96e62cab8f9cdacc6469773a87dfbc1a Mon Sep 17 00:00:00 2001 From: Jiao Li Date: Tue, 22 Sep 2009 04:30:11 +0000 Subject: EXT-1006 Name Tag options not remembered in the Preferences window -- to be reviewed --- indra/newview/llfloaterpreference.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/newview/llfloaterpreference.cpp') diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index b4f9176f9a..c197c78a41 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -233,10 +233,6 @@ void handleNameTagOptionChanged(const LLSD& newvalue) { gSavedSettings.setBOOL("SmallAvatarNames", TRUE); } - else - { - gSavedSettings.setBOOL("SmallAvatarNames", FALSE); - } } bool callback_skip_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater) -- cgit v1.2.3