From f41d06012b53c7fe65ec1347364a2228b2992dc7 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Thu, 3 Jun 2010 23:02:44 +0300 Subject: EXT-6384 FIXED check to disable 'Adult' setting when agent is not godlike but has admin menu enabled. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/508/ --HG-- branch : product-engine --- indra/newview/llfloaterpreference.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 593d5c267e..5fbbb2c1a8 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -501,7 +501,7 @@ void LLFloaterPreference::onOpen(const LLSD& key) if (can_choose_maturity) { // if they're not adult or a god, they shouldn't see the adult selection, so delete it - if (!gAgent.isAdult() && !gAgent.isGodlike()) + if (!gAgent.isAdult() && !gAgent.isGodlikeWithoutAdminMenuFakery()) { // we're going to remove the adult entry from the combo LLScrollListCtrl* maturity_list = maturity_combo->findChild("ComboBox"); -- cgit v1.2.3