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/llchatitemscontainerctrl.cpp | |
| parent | a3ca95e3bd0e288792f6024d9487d618730fd40f (diff) | |
| parent | a74d494dd7c13e0307ee5ba526ba021583b1f2b5 (diff) | |
Merge with tip
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+=" "; |