livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Kadah_Coba 2013-07-08 00:15:34 -07:00
parent 4179ba4400 270c05e1d8
commit 236663e9bf
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llavatarlistitem.cpp
View File

@ -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())

2
indra/newview/skins/default/xui/de/menu_people_nearby.xml
View File

@ -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"/>