From 27283c1de73282590e614b3d5e9bdabe922c0a94 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 5 Mar 2010 14:13:37 +0200
Subject: =?UTF-8?q?fixed=20EXT-5910=20=E2=80=9COffers=20logging=E2=80=9D,?=
 =?UTF-8?q?=20made=20logging=20offer=20notifications=20as=20from=20SecondL?=
 =?UTF-8?q?ife;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/llnotificationhandlerutil.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 11f210be93..8d1c244a7e 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -279,8 +279,8 @@ void LLHandlerUtil::logToIMP2P(const LLNotificationPtr& notification, bool to_fi
 		}
 		else
 		{
-			logToIM(IM_NOTHING_SPECIAL, session_name, name, notification->getMessage(),
-					from_id, from_id);
+			logToIM(IM_NOTHING_SPECIAL, session_name, "", notification->getMessage(),
+					from_id, LLUUID());
 		}
 	}
 }
@@ -348,7 +348,10 @@ std::string LLHandlerUtil::getSubstitutionName(const LLNotificationPtr& notifica
 	if (res.empty())
 	{
 		LLUUID from_id = notification->getPayload()["FROM_ID"];
-		gCacheName->getFullName(from_id, res);
+		if(!gCacheName->getFullName(from_id, res))
+		{
+			res = "";
+		}
 	}
 	return res;
 }
-- 
cgit v1.2.3