diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-06-03 23:02:44 +0300 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-06-03 23:02:44 +0300 |
| commit | f41d06012b53c7fe65ec1347364a2228b2992dc7 (patch) | |
| tree | d1a954f3f35c33ecf30f5be7c3ab307bd0efbca2 /indra/newview | |
| parent | 59496719bb2c986dcc7bacecaec6fe120d063808 (diff) | |
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
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<LLScrollListCtrl>("ComboBox"); |