summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-06-02 11:09:17 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-06-02 11:09:17 -0700
commit28d23e8c85ba6073cffbd3597342c43f4f9c7971 (patch)
tree8e817fa78c67ffe686d57f4889016623dfeffab2 /indra/newview/llviewermessage.cpp
parentb742f0c2a4cf1355044fbcebdad4346a4871a89b (diff)
parent4835c615d5a00f146bcd5c7a50153418ce2a3613 (diff)
Merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index cca1415f9c..182b216cbb 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3006,7 +3006,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
// IDEVO Correct for new-style "Resident" names
if (chat.mSourceType == CHAT_SOURCE_AGENT)
{
- // JAMESDEBUG - I don't know if it's OK to change this here, if
+ // I don't know if it's OK to change this here, if
// anything downstream does lookups by name, for instance
LLAvatarName av_name;
if (LLAvatarNameCache::useDisplayNames()