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/llchatitemscontainerctrl.cpp | |
| parent | 2a00a16f57daf7c3f99b0374901c03644a5b5f1b (diff) | |
| parent | fddc7d856e420b24e67f1f20af7bc45817a1a8fb (diff) | |
Merge
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index 60a37ac4af..9ce3f29853 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -170,10 +170,7 @@ void LLNearbyChatToastPanel::init(LLSD& notification) std::string str_sender; - if(gAgentID != mFromID) - str_sender = fromName; - else - str_sender = LLTrans::getString("You"); + str_sender = fromName; str_sender+=" "; |