From 0d7d486f8f14f160de82170ea2f05f1c636b879d Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Thu, 1 Apr 2010 21:22:12 +0300 Subject: Fixed bug EXT-6337 (Changing maturity settings in preferences floater only works on first floater spawn when account is not age verified). I'm actually copying an existing fix from the viewer-hotfix branch. See the ticket for more details. Not reviewed. --HG-- branch : product-engine --- indra/newview/llfloaterpreference.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'indra/newview/llfloaterpreference.cpp') diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 3487f52f35..1172064b59 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -515,13 +515,15 @@ void LLFloaterPreference::onOpen(const LLSD& key) // if they're not adult or a god, they shouldn't see the adult selection, so delete it if (!gAgent.isAdult() && !gAgent.isGodlike()) { - // 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'. - maturity_combo->remove(0); + // we're going to remove the adult entry from the combo + LLScrollListCtrl* maturity_list = maturity_combo->findChild("ComboBox"); + if (maturity_list) + { + maturity_list->deleteItems(LLSD(SIM_ACCESS_ADULT)); + } } childSetVisible("maturity_desired_combobox", true); - childSetVisible("maturity_desired_textbox", false); + childSetVisible("maturity_desired_textbox", false); } else { -- cgit v1.2.3