From e188badaf29a1a02307f93864eed6737096bd9a1 Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Tue, 3 Feb 2009 17:56:26 +0000
Subject: QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme

svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
---
 indra/llwindow/llwindowmacosx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llwindow/llwindowmacosx.cpp')

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 49fbb78d9d..8d446f18f1 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -702,7 +702,7 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 		"Radeon DDR",
 		"Radeon VE",
 		"GDI Generic" };
-		const S32 CARD_COUNT = sizeof(CARD_LIST)/sizeof(char*);
+		const S32 CARD_COUNT = LL_ARRAY_SIZE(CARD_LIST);
 
 		// Future candidates:
 		// ProSavage/Twister
-- 
cgit v1.2.3