diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-11 16:05:42 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-11 16:05:42 -0800 |
| commit | 1a35fe8725d4a55ef1e1b07d59db8e8d0db5e6bf (patch) | |
| tree | 04895ab55cf6ab33f1412131c76a71f4f4d549d4 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 8440d99e4498882dfc61459a91eba746ad717000 (diff) | |
| parent | 2aaa7971945823f53f0a01028036c37361bcfa17 (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+=" "; |