From eb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Tue, 4 Aug 2009 01:12:59 +0000
Subject: svn merge -r 128442:129343
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

---
 indra/newview/llfloatertestlistview.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llfloatertestlistview.cpp')

diff --git a/indra/newview/llfloatertestlistview.cpp b/indra/newview/llfloatertestlistview.cpp
index f7a327c088..5c942d0ed9 100644
--- a/indra/newview/llfloatertestlistview.cpp
+++ b/indra/newview/llfloatertestlistview.cpp
@@ -63,15 +63,15 @@ BOOL LLFloaterTestListView::postBuild()
 
 void LLFloaterTestListView::onListViewChanged()
 {
-	llinfos << "JAMESDEBUG list view changed" << llendl;
+	llinfos << "list view changed" << llendl;
 }
 
 void LLFloaterTestListView::onClickTest1()
 {
-	llinfos << "JAMESDEBUG test 1" << llendl;
+	llinfos << "test 1" << llendl;
 }
 
 void LLFloaterTestListView::onClickTest2()
 {
-	llinfos << "JAMESDEBUG test 2" << llendl;
+	llinfos << "test 2" << llendl;
 }
-- 
cgit v1.2.3