diff options
| author | Runitai <> | 2010-01-11 11:24:04 -0600 |
|---|---|---|
| committer | Runitai <> | 2010-01-11 11:24:04 -0600 |
| commit | 78cb4204a471129a3f3486d33cf115de816de36c (patch) | |
| tree | bd2d8ea33a1c9d8b2893a1e8efc480d5bb87dc3a /indra/newview/llimfloater.cpp | |
| parent | 2a00a16f57daf7c3f99b0374901c03644a5b5f1b (diff) | |
| parent | fddc7d856e420b24e67f1f20af7bc45817a1a8fb (diff) | |
Merge
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; |
