diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-01-11 17:27:45 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-01-11 17:27:45 -0800 |
| commit | 77565ce0c35fb35701bb51a82d70214a3ad56a12 (patch) | |
| tree | dbbb8284e0db98bcc3db829a9d3192e86f924ea0 /indra/newview/llimfloater.cpp | |
| parent | a3ca95e3bd0e288792f6024d9487d618730fd40f (diff) | |
| parent | a74d494dd7c13e0307ee5ba526ba021583b1f2b5 (diff) | |
Merge with tip
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; |