diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
| commit | 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac (patch) | |
| tree | 52f41bda3e57a58e968421212a8a48eead6f653d /indra/newview/llpanelgroupgeneral.cpp | |
| parent | 833e8d5c2a1dd48fd89b8b438dbe56572697bb76 (diff) | |
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupgeneral.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index ba0895def1..dfb9bbb175 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -161,7 +161,7 @@ BOOL LLPanelGroupGeneral::postBuild() { mCtrlMature->setCommitCallback(onCommitAny); mCtrlMature->setCallbackUserData(this); - mCtrlMature->setVisible( gAgent.mAccess > SIM_ACCESS_PG ); + mCtrlMature->setVisible( !gAgent.isTeen() ); } mCtrlOpenEnrollment = (LLCheckBoxCtrl*) getChildByName("open_enrollement", recurse); @@ -478,7 +478,7 @@ bool LLPanelGroupGeneral::apply(LLString& mesg) if (mInsignia) gdatap->mInsigniaID = mInsignia->getImageAssetID(); if (mCtrlMature) { - if (gAgent.mAccess > SIM_ACCESS_PG) + if (!gAgent.isTeen()) { gdatap->mMaturePublish = mCtrlMature->get(); } @@ -641,7 +641,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc) { mCtrlMature->set(gdatap->mMaturePublish); mCtrlMature->setEnabled(mAllowEdit && can_change_ident); - mCtrlMature->setVisible( gAgent.mAccess > SIM_ACCESS_PG ); + mCtrlMature->setVisible( !gAgent.isTeen() ); } if (mCtrlOpenEnrollment) { |