From 8f7ec64899c54dcee6caa0307510cc4003ba7bdd Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 27 Jul 2009 17:56:26 +0000
Subject: Merged skinning-17 into viewer-2 for bug fixes.  Commented out new IM
 window for now, not complete. Merging revisions 127913-128319 of
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into
 D:\viewer-2.0.0-3, respecting ancestry

---
 indra/llui/llscrolllistitem.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/llui/llscrolllistitem.h')

diff --git a/indra/llui/llscrolllistitem.h b/indra/llui/llscrolllistitem.h
index 4237d5b304..c2b7effbc7 100644
--- a/indra/llui/llscrolllistitem.h
+++ b/indra/llui/llscrolllistitem.h
@@ -68,7 +68,7 @@ public:
 		Ignored				type; 
 		Ignored				length; 
 
-		Multiple<LLScrollListCell::Params> cells;
+		Multiple<LLScrollListCell::Params> columns;
 
 		Params()
 		:	enabled("enabled", true),
@@ -76,9 +76,9 @@ public:
 			name("name"),
 			type("type"),
 			length("length"),
-			cells("columns")
+			columns("columns")
 		{
-			addSynonym(cells, "column");
+			addSynonym(columns, "column");
 			addSynonym(value, "id");
 		}
 	};
-- 
cgit v1.2.3