From 397fe6691018f428fb21760ffa7114948904fdd5 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 8 Mar 2010 11:21:06 -0800
Subject: Fixed merge conflict with online/offline notifications

---
 indra/newview/llcallingcard.cpp                      | 7 +++----
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 2b124118ca..b4c4ddcbf4 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -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;
 					}
 				}
 			}
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7f0a3ff360..8c07198111 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -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
-- 
cgit v1.2.3