diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-04 10:27:46 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-04 10:27:46 -0400 |
| commit | a77d273e3ab448d84507bfdb763df8335eadea9e (patch) | |
| tree | 938e3b9b25ef1dd675d0acd2cf322f059b048d8b /indra/newview/llfloaterpreference.cpp | |
| parent | 882d8952dad1de21a3b2fca76e5f418b4c1b440f (diff) | |
| parent | 15b855409a0ae7588236fe43f4aaa1d5d389b005 (diff) | |
automated 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"); |