Second Life viewer sources 1.15.0.2

1 files changed, 20 insertions, 5 deletions

diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index e99f341..67a0c31 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -165,6 +166,7 @@ BOOL LLPanelGroupGeneral::postBuild()
         {
                 mCtrlMature->setCommitCallback(onCommitAny);
                 mCtrlMature->setCallbackUserData(this);
+                mCtrlMature->setVisible( gAgent.mAccess > SIM_ACCESS_PG );
         }
 
         mCtrlOpenEnrollment = (LLCheckBoxCtrl*) getChildByName("open_enrollement", recurse);
@@ -466,7 +468,17 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
                 if (mCtrlPublishOnWeb) gdatap->mAllowPublish = mCtrlPublishOnWeb->get();
                 if (mEditCharter) gdatap->mCharter = mEditCharter->getText();
                 if (mInsignia) gdatap->mInsigniaID = mInsignia->getImageAssetID();
-                if (mCtrlMature) gdatap->mMaturePublish = mCtrlMature->get();
+                if (mCtrlMature)
+                {
+                        if (gAgent.mAccess > SIM_ACCESS_PG)
+                        {
+                                gdatap->mMaturePublish = mCtrlMature->get();
+                        }
+                        else
+                        {
+                                gdatap->mMaturePublish = FALSE;
+                        }
+                }
                 if (mCtrlShowInGroupList) gdatap->mShowInList = mCtrlShowInGroupList->get();
         }
 
@@ -617,6 +629,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
         {
                 mCtrlMature->set(gdatap->mMaturePublish);
                 mCtrlMature->setEnabled(mAllowEdit && can_change_ident);
+                mCtrlMature->setVisible( gAgent.mAccess > SIM_ACCESS_PG );
         }
         if (mCtrlOpenEnrollment) 
         {
@@ -646,7 +659,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 
                 if ( visible )
                 {
-                        snprintf(fee_buff, sizeof(fee_buff), "Join (L$%d)", gdatap->mMembershipFee);            /*Flawfinder: ignore*/
+                        snprintf(fee_buff, sizeof(fee_buff), "Join (L$%d)", gdatap->mMembershipFee);                    /* Flawfinder: ignore */
                         mBtnJoinGroup->setLabelSelected(std::string(fee_buff));
                         mBtnJoinGroup->setLabelUnselected(std::string(fee_buff));
                 }
@@ -702,12 +715,14 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
                 }
                 else
                 {
-                        LLScrollListItem* row = new LLScrollListItem( TRUE, NULL, LLUUID::null );
                         std::stringstream pending;
                         pending << "Retrieving member list (" << gdatap->mMembers.size() << "\\" << gdatap->mMemberCount  << ")";
-                        row->addColumn(pending.str(), LLFontGL::sSansSerif);
+
+                        LLSD row;
+                        row["columns"][0]["value"] = pending.str();
+
                         mListVisibleMembers->setEnabled(FALSE);
-                        mListVisibleMembers->addItem(row);
+                        mListVisibleMembers->addElement(row);
                 }
         }
 }