diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 589ad613e654e71debed6bd474ca63fbfba1d7bc..0938e6855dadec243d0dd0a313296f2da5b3f7f1 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -59,14 +59,12 @@ static const F32 LIT_UPDATE_PERIOD = 2;
 // Used to limit time spent for avatar list update per frame.
 static const unsigned ADD_LIMIT = 50;
 
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2013-06-03 (Catznip-3.4)
 void LLAvatarList::ShowPermissionTypeNames::declareValues()
 {
 	declare("never", SP_NEVER);
 	declare("hover", SP_HOVER);
 	declare("nondefault", SP_NONDEFAULT);
 }
-// [/SL:KB]
 
 bool LLAvatarList::contains(const LLUUID& id)
 {
@@ -103,7 +101,6 @@ void LLAvatarList::setSpeakingIndicatorsVisible(bool visible)
 	}
 }
 
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2013-06-03 (Catznip-3.4)
 void LLAvatarList::showPermissions(EShowPermissionType spType)
 {
 	// Save the value for new items to use.
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h
index 3ff837d9f10d57bbc38bb299af5904bc251209b3..8b783dacb7f7651006ad19cd7423168c0ccea28b 100644
--- a/indra/newview/llavatarlist.h
+++ b/indra/newview/llavatarlist.h
@@ -84,10 +84,7 @@ class LLAvatarList final : public LLFlatListViewEx
 
 	void toggleIcons();
 	void setSpeakingIndicatorsVisible(bool visible);
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2013-06-03 (Catznip-3.4)
 	void showPermissions(EShowPermissionType spType);
-// [/SL:KB]
-//	void showPermissions(bool visible);
 	void sortByName();
 	void setShowIcons(std::string param_name);
 	bool getIconsVisible() const { return mShowIcons; }
@@ -145,10 +142,7 @@ class LLAvatarList final : public LLFlatListViewEx
 	bool mShowInfoBtn;
 	bool mShowProfileBtn;
 	bool mShowSpeakingIndicator;
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2013-06-03 (Catznip-3.4)
 	EShowPermissionType mShowPermissions;
-// [/SL:KB]
-//	bool mShowPermissions;
 	bool mShowCompleteName;
 // [RLVa:KB] - RLVa-1.2.0
 	bool mRlvCheckShowNames;
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index b1d3354640ce8ed15ea9e06062550b42a1ecd56c..3eb270aff2d5e04157350053dbca15e40803e5a0 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -207,10 +207,7 @@ void LLAvatarListItem::onMouseEnter(S32 x, S32 y, MASK mask)
 	mHovered = true;
 	LLPanel::onMouseEnter(x, y, mask);
 
-//	showPermissions(mShowPermissions);
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2010-10-26 (Catznip-2.3)
 	refreshPermissions();
-// [/SL:KB]
 	updateChildren();
 }
 
@@ -223,10 +220,7 @@ void LLAvatarListItem::onMouseLeave(S32 x, S32 y, MASK mask)
 	mHovered = false;
 	LLPanel::onMouseLeave(x, y, mask);
 
-//	showPermissions(false);
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2010-10-26 (Catznip-2.3)
 	refreshPermissions();
-// [/SL:KB]
 	updateChildren();
 }
 
@@ -238,10 +232,7 @@ void LLAvatarListItem::changed(U32 mask)
 
 	if (mask & LLFriendObserver::POWERS)
 	{
-//		showPermissions(mShowPermissions && mHovered);
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2010-10-26 (Catznip-2.3)
 		refreshPermissions();
-// [/SL:KB]
 		updateChildren();
 	}
 }
@@ -331,24 +322,20 @@ void LLAvatarListItem::setAvatarId(const LLUUID& id, const LLUUID& session_id, b
 	}
 }
 
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2010-10-24 (Catznip-2.3)
 void LLAvatarListItem::setShowPermissions(EShowPermissionType spType)
 {
 	mShowPermissions = spType;
 
-// [SL:KB] - Patch: UI-SidepanelPeople | Checked: 2011-05-13 (Catznip-2.6)
 	// Reenable the controls for updateChildren()
 	mIconPermissionOnline->setEnabled(SP_NEVER != mShowPermissions);
 	mIconPermissionMap->setEnabled(SP_NEVER != mShowPermissions);
 	mIconPermissionEditMine->setEnabled(SP_NEVER != mShowPermissions);
 	mIconPermissionEditTheirs->setEnabled(SP_NEVER != mShowPermissions);
 	mIconPermissionMapTheirs->setEnabled(SP_NEVER != mShowPermissions);
-// [/SL:KB]
 	
 	refreshPermissions();
 	updateChildren();
 }
-// [/SL:KB]
 
 void LLAvatarListItem::showTextField(bool show)
 {
@@ -418,7 +405,6 @@ void LLAvatarListItem::onProfileBtnClick()
 	LLAvatarActions::showProfile(mAvatarId);
 }
 
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2010-11-04 (Catznip-2.3)
 void LLAvatarListItem::onPermissionBtnToggle(S32 toggleRight)
 {
 	LLRelationship* pRelationship = const_cast<LLRelationship*>(LLAvatarTracker::instance().getBuddyInfo(mAvatarId));
@@ -491,7 +477,6 @@ void LLAvatarListItem::onModifyRightsConfirmationCallback(const LLSD& notificati
 		updateChildren();
 	}
 }
-// [/SL:KB]
 
 BOOL LLAvatarListItem::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
@@ -788,20 +773,14 @@ void LLAvatarListItem::updateChildren()
 	LL_DEBUGS("AvatarItemReshape") << "name rect after: " << name_view_rect << LL_ENDL;
 }
 
-//bool LLAvatarListItem::showPermissions(bool visible)
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2010-10-26 (Catznip-2.3)
 bool LLAvatarListItem::refreshPermissions()
-// [/SL:KB]
 {
 	static const std::string strUngrantedOverlay = "Permission_Ungranted";
 
 	const LLRelationship* relation = LLAvatarTracker::instance().getBuddyInfo(getAvatarId());
-//	if(relation && visible)
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2010-10-26 (Catznip-2.3)
+
 	if( (relation) && (((SP_HOVER == mShowPermissions) && (mHovered)) || (SP_NONDEFAULT == mShowPermissions)) )
-// [/SL:KB]
 	{
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2010-10-26 (Catznip-2.3)
 		bool fGrantedOnline = relation->isRightGrantedTo(LLRelationship::GRANT_ONLINE_STATUS);
 		mIconPermissionOnline->setVisible( (!fGrantedOnline) || (mHovered) );
 		mIconPermissionOnline->setImageOverlay( (fGrantedOnline) ? "" : strUngrantedOverlay);
@@ -813,10 +792,7 @@ bool LLAvatarListItem::refreshPermissions()
 		bool fGrantedEditMine = relation->isRightGrantedTo(LLRelationship::GRANT_MODIFY_OBJECTS);
 		mIconPermissionEditMine->setVisible( (fGrantedEditMine) || (mHovered) );
 		mIconPermissionEditMine->setImageOverlay( (fGrantedEditMine) ? "" : strUngrantedOverlay);
-// [/SL:KB]
-//		mIconPermissionOnline->setVisible(relation->isRightGrantedTo(LLRelationship::GRANT_ONLINE_STATUS));
-//		mIconPermissionMap->setVisible(relation->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION));
-//		mIconPermissionEditMine->setVisible(relation->isRightGrantedTo(LLRelationship::GRANT_MODIFY_OBJECTS));
+
 		mIconPermissionEditTheirs->setVisible(relation->isRightGrantedFrom(LLRelationship::GRANT_MODIFY_OBJECTS));
 		mIconPermissionMapTheirs->setVisible(relation->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION));
 	}
@@ -844,7 +820,6 @@ LLView* LLAvatarListItem::getItemChildView(EAvatarListItemChildIndex child_view_
 	case ALIC_NAME:
 		child_view = mAvatarName;
 		break;
-// [SL:KB] - Patch: UI-AvatarListTextField | Checked: 2010-10-24 (Catznip-2.3)
 	case ALIC_TEXT_FIELD:
 		child_view = mTextField;
 		break;
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index c59dea01e05bfcfec9482470da66cbf9372e60db..f886a157044fc9b1e0da2dcd2831a7fcd13b45ad 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -112,10 +112,7 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver
 	void setShowProfileBtn(bool show);
 	void setShowInfoBtn(bool show);
 	void showSpeakingIndicator(bool show);
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2013-06-03 (Catznip-3.4)
 	void setShowPermissions(EShowPermissionType spType);
-// [/SL:KB]
-//	void setShowPermissions(bool show) { mShowPermissions = show; };
 
 	void showTextField(bool show);
 	void setAvatarIconVisible(bool visible);
@@ -130,10 +127,9 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver
 
 	void onInfoBtnClick();
 	void onProfileBtnClick();
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2010-11-04 (Catznip-2.3)
+
 	void onPermissionBtnToggle(S32 toggleRight);
 	void onModifyRightsConfirmationCallback(const LLSD& notification, const LLSD& response, bool fGrant);
-// [/SL:KB]
 
 	/*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask) final override;
 
@@ -213,10 +209,7 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver
 	 *
 	 * Need to call updateChildren() afterwards to sort out their layout.
 	 */
-//	bool showPermissions(bool visible);
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2010-10-26 (Catznip-2.3)
 	bool refreshPermissions();
-// [/SL:KB]
 
 	/**
 	 * Gets child view specified by index.
@@ -245,10 +238,7 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver
 // [/RLVa:KB]
 
 	/// indicates whether to show icons representing permissions granted
-// [SL:KB] - Patch: UI-PeopleFriendPermissions | Checked: 2013-06-03 (Catznip-3.4)
 	EShowPermissionType mShowPermissions;
-// [/SL:KB]
-//	bool mShowPermissions;
 
 	/// true when the mouse pointer is hovering over this item
 	bool mHovered;