summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-03-09 14:05:09 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-03-09 14:05:09 +0200
commit33133d4d7c5ee060dfbd6cb03fe50d8da0235146 (patch)
treee66db07685efc80aa0e1b65b13dbe923c729313e /indra/newview
parent2f9cc80c2e0a6ca648871ed74cc10b813d2c4940 (diff)
fixed EXT-5910 “Offers logging”,
replaced interactive system message marker with correct from string value; --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimview.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 9ea8364491..6ce06adc80 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -717,8 +717,15 @@ LLIMModel::LLIMSession* LLIMModel::addMessageSilently(const LLUUID& session_id,
return NULL;
}
- addToHistory(session_id, from, from_id, utf8_text);
- if (log2file) logToFile(session_id, from, from_id, utf8_text);
+ // replace interactive system message marker with correct from string value
+ std::string from_name = from;
+ if (INTERACTIVE_SYSTEM_FROM == from)
+ {
+ from_name = SYSTEM_FROM;
+ }
+
+ addToHistory(session_id, from_name, from_id, utf8_text);
+ if (log2file) logToFile(session_id, from_name, from_id, utf8_text);
session->mNumUnread++;