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

Fixed merge conflict with online/offline notifications

meow-7.2.2
James Cook 2010-03-08 11:21:06 -08:00
parent 18ebacefcf
commit 397fe66910
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llcallingcard.cpp
View File

@ -694,12 +694,11 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
setBuddyOnline(agent_id,online);
if(chat_notify)
{
std::string first, last;
if(gCacheName->getName(agent_id, first, last))
std::string full_name;
if(gCacheName->getFullName(agent_id, full_name))
{
notify = TRUE;
args["FIRST"] = first;
args["LAST"] = last;
args["NAME"] = full_name;
}
}
}

4
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -4330,14 +4330,14 @@ Topic: [SUBJECT], Message: [MESSAGE]
icon="notifytip.tga"
name="FriendOnline"
type="notifytip">
[FIRST] [LAST] is Online
[NAME] is Online
</notification>
<notification
icon="notifytip.tga"
name="FriendOffline"
type="notifytip">
[FIRST] [LAST] is Offline
[NAME] is Offline
</notification>
<notification