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/lllogchat.cpp | |
| parent | a570c39bd3ca9ca567ef6a778305b8231535eb70 (diff) | |
| parent | 370a8592ac4c3b6eb6fd9f6ddd35960b763e634f (diff) | |
Merge, sync from viewer-2-0, fixed conflict in llinspectavatar.cpp
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index fc9654e9ad..92f19c9232 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -59,9 +59,6 @@ const static std::string NEW_LINE_SPACE_PREFIX("\n "); const static std::string TWO_SPACES(" "); const static std::string MULTI_LINE_PREFIX(" "); -//viewer 1.23 may have used "You" for Agent's entries -const static std::string YOU("You"); - /** * Chat log lines - timestamp and name are optional but message text is mandatory. * |