diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-04 13:23:12 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-04 13:23:12 -0700 |
| commit | b1b4e56bcec6718a971f01d51ffe4363e8fba9ac (patch) | |
| tree | 82b763d1ed3782fe9ec3f6f0c5f17f2bc0abf7a3 /indra/newview/llfloaterpreference.cpp | |
| parent | c393383f4463f40e4574968c0b440c51022be7b9 (diff) | |
| parent | 6d840687a5306f9234444ed1bde1f6b877da3996 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -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"); |