diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-17 14:01:35 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-17 14:01:35 -0800 |
| commit | 50e696872ecebd37e8a43df3031e4cdaf26147a9 (patch) | |
| tree | 7a0eadbb49db2b1d37306c89e588d2ae64510145 /indra/newview/llfloaterpreference.cpp | |
| parent | 1c0603bef2bac6e006df7566aa2a3f8c351a1b7f (diff) | |
| parent | 5fd3f8e61c9c37c4cf6a1aabc11f2f9ee710053f (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/q/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 c6719a3092..0b7e3fee30 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"); |