diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-17 18:47:12 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-17 18:47:12 -0500 |
| commit | 0aaaa06fe0149ffbc22823daa095749be1abe3e0 (patch) | |
| tree | 895f584298f3b2d66fc25b86f97b7184910748bf /indra/newview/llfloaterpreference.cpp | |
| parent | a3c93cccef04b3efc133ef653dbd9e53d7580aeb (diff) | |
| parent | 29dd5afaa8a85f0b57ddb3e9e281e1e6f5b43e29 (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 3e7bf51f4c..e5c8ddf0a4 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -511,7 +511,8 @@ void LLFloaterPreference::onOpen(const LLSD& key) // if we have no agent, we can't let them choose anything // if we have an agent, then we only let them choose if they have a choice bool can_choose_maturity = - gAgent.getID().notNull() && (gAgent.isMature() || gAgent.isGodlike()); + gAgent.getID().notNull() && + (gAgent.isMature() || gAgent.isGodlike()); LLComboBox* maturity_combo = getChild<LLComboBox>("maturity_desired_combobox"); |