diff options
author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-11 15:09:23 +0200 |
---|---|---|
committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-11 15:09:23 +0200 |
commit | 31c5c18f6c1325060fa3ea3fb2253168fd98adda (patch) | |
tree | 137927cad5301959cb7b1f3c026b0c873676686f /indra/newview/llimfloater.cpp | |
parent | 4a902dd76ae1bbf2e080632ebb51896ed6f007b3 (diff) | |
parent | d0c029c6094bf23ad9a016d9029b830d674a566a (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r-- | indra/newview/llimfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index fdc5d14d97..b05568f353 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -595,7 +595,7 @@ void LLIMFloater::updateMessages() std::string time = msg["time"].asString(); LLUUID from_id = msg["from_id"].asUUID(); - std::string from = from_id != gAgentID ? msg["from"].asString() : LLTrans::getString("You"); + std::string from = msg["from"].asString(); std::string message = msg["message"].asString(); LLChat chat; |