From 1c22cc9c1e9ed19c376362d5b3f4c9ca57c93fc3 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 8 Jul 2013 02:58:49 +0200
Subject: [PATCH 1/2] Fix German translation for nearby/friends gear menu in
 people panel

---
 indra/newview/skins/default/xui/de/menu_people_nearby.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
index cdbb3ae917..8ce7e51561 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Avatar Context Menu">
+<context_menu name="Nearby People Context Menu">
 	<menu_item_call label="Profil anzeigen" name="view_profile"/>
 	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>

From 270c05e1d830439e7a9d6fb3ec1b82d65478f6ee Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 8 Jul 2013 03:15:23 +0200
Subject: [PATCH 2/2] Added some comments to mark our code in LLAvatarListItem

---
 indra/newview/llavatarlistitem.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 52917fdb6a..c0867bb609 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -129,8 +129,10 @@ LLAvatarListItem::~LLAvatarListItem()
 	if (mAvatarId.notNull())
 	{
 		LLAvatarTracker::instance().removeParticularFriendObserver(mAvatarId, this);
+		// <FS> Remove our own observers
 		LLAvatarTracker::instance().removeFriendPermissionObserver(mAvatarId, this);
 		LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarId, this); // may try to remove null observer
+		// </FS>
 	}
 
 	if (mAvatarNameCacheConnection.connected())