summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2009-11-30 19:59:44 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2009-11-30 19:59:44 +0200
commit5ed4c7015641b0739291c7fc75b67aa5b0ed36fc (patch)
treec451ded3878e52f8226104b25a52b9cb7a473915 /indra/newview/llimview.cpp
parent1a622243096d77856cc4ed2590dd99dd480e587e (diff)
implemented EXT-2962 “Implement adding messages into IM history w/o spawning
chiclet” --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp8
1 files changed, 7 insertions, 1 deletions
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