From 5ed4c7015641b0739291c7fc75b67aa5b0ed36fc Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Mon, 30 Nov 2009 19:59:44 +0200
Subject: =?UTF-8?q?implemented=20EXT-2962=20=E2=80=9CImplement=20adding=20?=
 =?UTF-8?q?messages=20into=20IM=20history=20w/o=20spawning=20chiclet?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/llimview.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llimview.cpp')

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 827234be6e..21a3ddfd78 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -455,7 +455,13 @@ bool LLIMModel::logToFile(const LLUUID& session_id, const std::string& from, con
 {
 	if (gSavedPerAccountSettings.getBOOL("LogInstantMessages"))
 	{
-		LLLogChat::saveHistory(LLIMModel::getInstance()->getName(session_id), from, from_id, utf8_text);
+		std::string name = LLIMModel::getInstance()->getName(session_id);
+		if (name == LLStringUtil::null)
+		{
+			name = from;
+		}
+
+		LLLogChat::saveHistory(name, from, from_id, utf8_text);
 		return true;
 	}
 	else
-- 
cgit v1.2.3