diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 18:54:47 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 18:54:47 +0000 |
| commit | b31d7cb22f1ab51428bdfbae6d252d7c22167b7a (patch) | |
| tree | 0202d447218fade13c7e9f87972d7c4966174d47 /indra/newview/llfloaterpreference.cpp | |
| parent | 2398ac98d01d3809904759251e2c98cf2740e139 (diff) | |
| parent | 2490f50ce1bc7ffe1e53a99e4081bee13253f09a (diff) | |
merge from viewer2.
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 f20ef76bed..6439a09562 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -514,7 +514,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"); |