diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-11 12:57:42 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-11 12:57:42 +0200 |
| commit | 9393c28831c3b51d9b84950bb0bc89ca50edac23 (patch) | |
| tree | 46f3aeb3d340d115c6ccd4a53993350b47691f96 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 1a21ce62c225dfc8f2671691929a3b1a9bc73726 (diff) | |
| parent | df08485cf840e21e2ec8d14664a45714e0a3ca96 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
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+=" "; |