diff options
| author | James Cook <james@lindenlab.com> | 2010-01-11 14:06:09 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-11 14:06:09 -0800 |
| commit | a36087f5c1851b0bd5eec5788609f35b8a524384 (patch) | |
| tree | d7057930083ba9499fc8b3783a531b24ac9ea7f1 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | a570c39bd3ca9ca567ef6a778305b8231535eb70 (diff) | |
| parent | 370a8592ac4c3b6eb6fd9f6ddd35960b763e634f (diff) | |
Merge, sync from viewer-2-0, fixed conflict in llinspectavatar.cpp
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+=" "; |