MAINT-1491 Make GPU table more readable, clear out some cruft, and start reporting raw GL strings in viewer stats instead of GPU table labels to make future GPU table overhauls more effective.

2 files changed, 95 insertions, 87 deletions

diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 46343ad130..5e8189caa5 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -60,14 +60,21 @@ ATI ASUS EAH24xx						.*ATI.*ASUS.*EAH24.*					2	1	0	0
 ATI ASUS EAH26xx						.*ATI.*ASUS.*EAH26.*					3	1	0	0
 ATI ASUS EAH29xx						.*ATI.*ASUS.*EAH29.*					3	1	0	0
 ATI ASUS EAH34xx						.*ATI.*ASUS.*EAH34.*					1	1	0	0
-ATI ASUS EAH36xx						.*ATI.*ASUS.*EAH36.*					3	1	0	0
+ATI ASUS EAH36xx						.*ATI.*ASUS.*EAH36.*					2	1	0	0
 ATI ASUS EAH38xx						.*ATI.*ASUS.*EAH38.*					2	1	1	3.3
 ATI ASUS EAH43xx						.*ATI.*ASUS.*EAH43.*					2	1	1	3.3
-ATI ASUS EAH45xx						.*ATI.*ASUS.*EAH45.*					1	1	0	0
+ATI ASUS EAH45xx						.*ATI.*ASUS.*EAH45.*					2	1	0	0
 ATI ASUS EAH48xx						.*ATI.*ASUS.*EAH48.*					3	1	1	3.3
 ATI ASUS EAH57xx						.*ATI.*ASUS.*EAH57.*					3	1	1	4.1
 ATI ASUS EAH58xx						.*ATI.*ASUS.*EAH58.*					5	1	1	4.1
-ATI ASUS EAH6xxx						.*ATI.*ASUS.*EAH6.*						3	1	1	4.1
+ATI ASUS EAH62xx						.*ATI.*ASUS.*EAH62.*					2	1	0	0
+ATI ASUS EAH63xx						.*ATI.*ASUS.*EAH63.*					2	1	0	0
+ATI ASUS EAH64xx						.*ATI.*ASUS.*EAH64.*					2	1	0	0
+ATI ASUS EAH65xx						.*ATI.*ASUS.*EAH65.*					2	1	0	0
+ATI ASUS EAH66xx						.*ATI.*ASUS.*EAH66.*					3	1	0	0
+ATI ASUS EAH67xx						.*ATI.*ASUS.*EAH67.*					3	1	0	0
+ATI ASUS EAH68xx						.*ATI.*ASUS.*EAH68.*					5	1	0	0
+ATI ASUS EAH69xx						.*ATI.*ASUS.*EAH69.*					5	1	0	0
 ATI ASUS Radeon X1xxx					.*ATI.*ASUS.*X1.*						2	1	1	2.1
 ATI Radeon X7xx							.*ATI.*ASUS.*X7.*						1	1	0	0
 ATI Radeon X19xx						.*ATI.*(Radeon|Diamond) X19.* ?.*		2	1	1	2.1
@@ -144,10 +151,10 @@ ATI Mobility Radeon HD 6200				.*ATI.*Mobility.*HD *62.*				3	1	0	0
 ATI Mobility Radeon HD 6300				.*ATI.*Mobility.*HD *63.*				3	1	1	4.2
 ATI Mobility Radeon HD 6400M			.*ATI.*Mobility.*HD *64.*				3	1	0	0
 ATI Mobility Radeon HD 6500M			.*ATI.*Mobility.*HD *65.*				5	1	1	4.2
-ATI Mobility Radeon HD 6600M			.*ATI.*Mobility.*HD *66.*				3	1	0	0
-ATI Mobility Radeon HD 6700M			.*ATI.*Mobility.*HD *67.*				3	1	0	0
-ATI Mobility Radeon HD 6800M			.*ATI.*Mobility.*HD *68.*				3	1	0	0
-ATI Mobility Radeon HD 6900M			.*ATI.*Mobility.*HD *69.*				3	1	0	0
+ATI Mobility Radeon HD 6600M			.*ATI.*Mobility.*HD *66.*				5	1	0	0
+ATI Mobility Radeon HD 6700M			.*ATI.*Mobility.*HD *67.*				5	1	0	0
+ATI Mobility Radeon HD 6800M			.*ATI.*Mobility.*HD *68.*				5	1	0	0
+ATI Mobility Radeon HD 6900M			.*ATI.*Mobility.*HD *69.*				5	1	0	0
 ATI Radeon HD 2300						.*ATI.*Radeon HD *23..					0	1	1	3.3
 ATI Radeon HD 2400						.*ATI.*Radeon HD *24..					1	1	1	4
 ATI Radeon HD 2600						.*ATI.*Radeon HD *26..					2	1	1	3.3
@@ -257,7 +264,7 @@ ATI 760G/Radeon 3000					.*ATI.*AMD 760G.*						1	1	1	3.3
 ATI 780L/Radeon 3000					.*ATI.*AMD 780L.*						1	1	0	0
 ATI Radeon DDR							.*ATI.*Radeon ?DDR.*					0	1	0	0
 ATI FirePro 2000						.*ATI.*FirePro 2.*						2	1	1	4.1
-ATI FirePro 3000						.*ATI.*FirePro V3.*						1	1	0	0
+ATI FirePro 3000						.*ATI.*FirePro V3.*						2	1	0	0
 ATI FirePro 4000						.*ATI.*FirePro V4.*						2	1	0	0
 ATI FirePro 5000						.*ATI.*FirePro V5.*						3	1	0	0
 ATI FirePro 7000						.*ATI.*FirePro V7.*						3	1	0	0
@@ -290,7 +297,7 @@ Intel HD Graphics 2000					.*Intel.*HD Graphics 2.*				2	1	0	0
 Intel HD Graphics 3000					.*Intel.*HD Graphics 3.*				3	1	1	3.1
 Intel HD Graphics 4000					.*Intel.*HD Graphics 4.*				3	1	1	3.3
 Intel HD2000							.*Intel.*HD2000.*						2	1	0	0
-Intel HD3000							.*Intel.*HD3000.*						3	1	1	3.1
+Intel HD3000							.*Intel.*HD3000.*						3	1	0	0
 Intel HD Graphics						.*Intel.*HD Graphics.*					2	1	1	4
 Intel Mobile 4 Series					.*Intel.*Mobile.* 4 Series.*			0	1	1	2.1
 Intel 4 Series Internal					.*Intel.* 4 Series Internal.*			1	1	1	2.1
@@ -305,59 +312,54 @@ Intel 3D-Analyze						.*Intel.*3D-Analyze.*					2	1	0	0
 Matrox									.*Matrox.*								0	0	0	0
 Mesa									.*Mesa.*								1	0	1	2.1
 Gallium									.*Gallium.*								1	1	1	2.1
-NVIDIA 205								.*NVIDIA .*GeForce 205.*				2	1	1	3.3
-NVIDIA 210								.*NVIDIA .*GeForce 210.*				3	1	1	3.3
-NVIDIA 310M								.*NVIDIA .*GeForce 310M.*				3	1	1	3.3
-NVIDIA 310								.*NVIDIA .*GeForce 310.*				3	1	1	3.3
-NVIDIA 315M								.*NVIDIA .*GeForce 315M.*				3	1	1	3.3
-NVIDIA 315								.*NVIDIA .*GeForce 315.*				3	1	1	3.3
-NVIDIA 320M								.*NVIDIA .*GeForce 320M.*				3	1	1	3.3
 NVIDIA G100M							.*NVIDIA .*100M.*						4	1	1	3.3
-NVIDIA G100								.*NVIDIA .*100.*						3	1	1	4.2
 NVIDIA G102M							.*NVIDIA .*102M.*						1	1	1	3.3
 NVIDIA G103M							.*NVIDIA .*103M.*						2	1	1	3.3
 NVIDIA G105M							.*NVIDIA .*105M.*						2	1	1	3.3
 NVIDIA G 110M							.*NVIDIA .*110M.*						1	1	1	3.3
 NVIDIA G 120M							.*NVIDIA .*120M.*						1	1	1	3.3
-NVIDIA G 200							.*NVIDIA .*200(M)?.*					1	1	1	4.2
-NVIDIA G 205M							.*NVIDIA .*205(M)?.*					0	1	0	0
-NVIDIA G 210							.*NVIDIA .*210(M)?.*					2	1	1	3.3
-NVIDIA 305M								.*NVIDIA .*305(M)?.*					1	1	0	0
-NVIDIA G 310M							.*NVIDIA .*310(M)?.*					2	1	0	0
-NVIDIA G 315							.*NVIDIA .*315(M)?.*					2	1	0	0
-NVIDIA G 320M							.*NVIDIA .*320(M)?.*					3	1	1	3.3
-NVIDIA G 405							.*NVIDIA .*405(M)?.*					3	1	1	3.3
-NVIDIA G 410M							.*NVIDIA .*410(M)?.*					3	1	1	4.2
-NVIDIA GT 120M							.*NVIDIA .*GT *120(M)?.*				3	1	1	3.3
-NVIDIA GT 120							.*NVIDIA .*GT.*120						2	1	0	0
-NVIDIA GT 130M							.*NVIDIA .*GT *130(M)?.*				3	1	1	3.3
-NVIDIA GT 140M							.*NVIDIA .*GT *140(M)?.*				3	1	1	3.3
-NVIDIA GT 150M							.*NVIDIA .*GT(S)? *150(M)?.*			2	1	0	0
-NVIDIA GT 160M							.*NVIDIA .*GT *160(M)?.*				2	1	0	0
-NVIDIA GT 220M							.*NVIDIA .*GT *220(M)?.*				3	1	1	3.3
-NVIDIA GT 230M							.*NVIDIA .*GT *230(M)?.*				3	1	1	3.3
-NVIDIA GT 240M							.*NVIDIA .*GT *240(M)?.*				3	1	1	3.3
-NVIDIA GT 250M							.*NVIDIA .*GT *250(M)?.*				2	1	0	0
-NVIDIA GT 260M							.*NVIDIA .*GT *260(M)?.*				2	1	0	0
-NVIDIA GT 320M							.*NVIDIA .*GT *320(M)?.*				2	1	0	0
-NVIDIA GT 325M							.*NVIDIA .*GT *325(M)?.*				3	1	1	3.3
-NVIDIA GT 330M							.*NVIDIA .*GT *330(M)?.*				3	1	1	3.3
-NVIDIA GT 335M							.*NVIDIA .*GT *335(M)?.*				3	1	1	3.3
-NVIDIA GT 340M							.*NVIDIA .*GT *340(M)?.*				4	1	1	3.3
-NVIDIA GT 415M							.*NVIDIA .*GT *415(M)?.*				3	1	1	4.2
-NVIDIA GT 420M							.*NVIDIA .*GT *420(M)?.*				3	1	1	4.2
-NVIDIA GT 425M							.*NVIDIA .*GT *425(M)?.*				4	1	1	4.2
-NVIDIA GT 430M							.*NVIDIA .*GT *430(M)?.*				3	1	1	4.2
-NVIDIA GT 435M							.*NVIDIA .*GT *435(M)?.*				4	1	1	4.2
-NVIDIA GT 440M							.*NVIDIA .*GT *440(M)?.*				3	1	1	4.2
-NVIDIA GT 445M							.*NVIDIA .*GT *445(M)?.*				3	1	1	4.2
-NVIDIA GT 450M							.*NVIDIA .*GT *450(M)?.*				3	1	0	0
-NVIDIA GT 520M							.*NVIDIA .*GT *52.(M)?.*				3	1	1	4.2
-NVIDIA GT 530M							.*NVIDIA .*GT *530(M)?.*				3	1	1	4.2
-NVIDIA GT 540M							.*NVIDIA .*GT *54.(M)?.*				3	1	1	4.2
-NVIDIA GT 550M							.*NVIDIA .*GT *550(M)?.*				3	1	1	4.2
-NVIDIA GT 555M							.*NVIDIA .*GT *555(M)?.*				3	1	1	4.2
-NVIDIA 610M								.*NVIDIA.*61*M.*						3	1	1	4.2
+NVIDIA G 205M							.*NVIDIA .*205M.*						1	1	0	0
+NVIDIA G 410M							.*NVIDIA .*410M.*						3	1	1	4.2
+NVIDIA GT 120M							.*NVIDIA .*GT *12*M.*					3	1	1	3.3
+NVIDIA GT 130M							.*NVIDIA .*GT *13*M.*					3	1	1	3.3
+NVIDIA GT 140M							.*NVIDIA .*GT *14*M.*					3	1	1	3.3
+NVIDIA GT 150M							.*NVIDIA .*GTS *15*M.*					2	1	0	0
+NVIDIA GTS 160M							.*NVIDIA .*GTS *16*M.*					2	1	0	0
+NVIDIA G210M							.*NVIDIA .*G21*M.*						3	1	0	0
+NVIDIA GT 220M							.*NVIDIA .*GT *22*M.*					3	1	1	3.3
+NVIDIA GT 230M							.*NVIDIA .*GT *23*M.*					3	1	1	3.3
+NVIDIA GT 240M							.*NVIDIA .*GT *24*M.*					3	1	1	3.3
+NVIDIA GTS 250M							.*NVIDIA .*GTS *25*M.*					3	1	0	0
+NVIDIA GTS 260M							.*NVIDIA .*GTS *26*M.*					3	1	0	0
+NVIDIA GTX 260M							.*NVIDIA .*GTX *26*M.*					3	1	0	0
+NVIDIA GTX 270M							.*NVIDIA .*GTX *27*M.*					3	1	0	0
+NVIDIA GTX 280M							.*NVIDIA .*GTX *28*M.*					3	1	0	0
+NVIDIA 300M								.*NVIDIA .*30*M.*						3	1	1	4.2
+NVIDIA G 310M							.*NVIDIA .*31*M.*						2	1	0	0
+NVIDIA GT 320M							.*NVIDIA .*GT *32*M.*					3	1	0	0
+NVIDIA GT 325M							.*NVIDIA .*GT *32*M.*					3	1	1	3.3
+NVIDIA GT 330M							.*NVIDIA .*GT *33*M.*					3	1	1	3.3
+NVIDIA GT 340M							.*NVIDIA .*GT *34*M.*					4	1	1	3.3
+NVIDIA GTS 350M							.*NVIDIA .*GTS *35*M.*					4	1	1	3.3
+NVIDIA GTS 360M							.*NVIDIA .*GTS *36*M.*					5	1	1	3.3
+NVIDIA 405M								.*NVIDIA .* 40*M.*						2	1	0	0
+NVIDIA 410M								.*NVIDIA .* 41*M.*						3	1	0	0
+NVIDIA GT 415M							.*NVIDIA .*GT *41*M.*					3	1	1	4.2
+NVIDIA GT 420M							.*NVIDIA .*GT *42*M.*					3	1	1	4.2
+NVIDIA GT 430M							.*NVIDIA .*GT *43*M.*					3	1	1	4.2
+NVIDIA GT 440M							.*NVIDIA .*GT *44*M.*					3	1	1	4.2
+NVIDIA GT 450M							.*NVIDIA .*GT *45*M.*					3	1	0	0
+NVIDIA GTX 460M							.*NVIDIA .*GTX *46*M.*					4	1	1	4.2
+NVIDIA GTX 470M							.*NVIDIA .*GTX *47*M.*					3	1	0	0
+NVIDIA GTX 480M							.*NVIDIA .*GTX *48*M.*					3	1	1	4.2
+NVIDIA GT 520M							.*NVIDIA .*GT *52*M.*					3	1	1	4.2
+NVIDIA GT 530M							.*NVIDIA .*GT *53*M.*					3	1	1	4.2
+NVIDIA GT 540M							.*NVIDIA .*GT *54*M.*					3	1	1	4.2
+NVIDIA GT 550M							.*NVIDIA .*GT *55*M.*					3	1	1	4.2
+NVIDIA GTX 560M							.*NVIDIA .*GTX *56*M.*					3	1	0	0
+NVIDIA GTX 570M							.*NVIDIA .*GTX *57*M.*					5	1	0	0
+NVIDIA GTX 580M							.*NVIDIA .*GTX *58*M.*					5	1	1	4.2
+NVIDIA 610M								.*NVIDIA.* 61*M.*						3	1	1	4.2
 NVIDIA GT 620M							.*NVIDIA .*GT *62*M.*					3	1	0	0
 NVIDIA GT 630M							.*NVIDIA .*GT *63*M.*					3	1	0	0
 NVIDIA GT 640M							.*NVIDIA .*GT *64*M.*					3	1	0	0
@@ -366,44 +368,50 @@ NVIDIA GTX 660M							.*NVIDIA .*GTX *66*M.*					5	1	0	0
 NVIDIA GTX 670M							.*NVIDIA .*GTX *67*M.*					5	1	1	4.2
 NVIDIA GTX 680M							.*NVIDIA .*GTX *68*M.*					5	1	0	0
 NVIDIA GTX 690M							.*NVIDIA .*GTX *69*M.*					5	1	0	0
-NVIDIA GT 610							.*NVIDIA .*GT *61.*						3	1	1	4.2
-NVIDIA GT 620							.*NVIDIA .*GT *62.*						3	1	0	0
-NVIDIA GT 630							.*NVIDIA .*GT *63.*						3	1	1	4.2
-NVIDIA GT 640							.*NVIDIA .*GT *64.*						3	1	0	0
-NVIDIA GT 650							.*NVIDIA .*GT *65.*						3	1	1	4.2
-NVIDIA GTX 660							.*NVIDIA .*GTX *66.*					5	1	0	0
-NVIDIA GTX 670							.*NVIDIA .*GTX *67.*					5	1	1	4.2
-NVIDIA GTX 680							.*NVIDIA .*GTX *68.*					5	1	1	4.2
-NVIDIA GTX 690							.*NVIDIA .*GTX *69.*					5	1	1	4.2
-NVIDIA GTS 160M							.*NVIDIA .*GT(S)? *160(M)?.*			2	1	0	0
+NVIDIA G100								.*NVIDIA .*G10.*						3	1	1	4.2
+NVIDIA GT 120							.*NVIDIA .*GT *12.*						2	1	0	0
+NVIDIA GT 130							.*NVIDIA .*GT *13.*						2	1	0	0
+NVIDIA GTS 150							.*NVIDIA .*GTS *15.*					2	1	0	0
+NVIDIA 205								.*NVIDIA .*GeForce 205.*				2	1	1	3.3
+NVIDIA 210								.*NVIDIA .*GeForce 210.*				3	1	1	3.3
+NVIDIA GT 220							.*NVIDIA .*GT *22.*						2	1	1	3.3
 NVIDIA GTS 240							.*NVIDIA .*GTS *24.*					4	1	1	3.3
 NVIDIA GTS 250							.*NVIDIA .*GTS *25.*					4	1	1	3.3
-NVIDIA GTS 350M							.*NVIDIA .*GTS *350M.*					4	1	1	3.3
-NVIDIA GTS 360M							.*NVIDIA .*GTS *360M.*					5	1	1	3.3
-NVIDIA GTS 360							.*NVIDIA .*GTS *360.*					3	1	0	0
-NVIDIA GTS 450							.*NVIDIA .*GTS *45.*					4	1	1	4.2
 NVIDIA GTX 260							.*NVIDIA .*GTX *26.*					4	1	1	3.3
-NVIDIA GTX 275							.*NVIDIA .*GTX *275.*					4	1	1	3.3
-NVIDIA GTX 270							.*NVIDIA .*GTX *27.*					3	1	0	0
-NVIDIA GTX 285							.*NVIDIA .*GTX *285.*					5	1	1	3.3
-NVIDIA GTX 280							.*NVIDIA .*GTX *280.*					4	1	1	3.3
-NVIDIA GTX 290							.*NVIDIA .*GTX *290.*					3	1	0	0
-NVIDIA GTX 295							.*NVIDIA .*GTX *295.*					5	1	1	3.3
-NVIDIA GTX 460M							.*NVIDIA .*GTX *460M.*					4	1	1	4.2
-NVIDIA GTX 465							.*NVIDIA .*GTX *465.*					5	1	1	4.2
+NVIDIA GTX 270							.*NVIDIA .*GTX *27.*					4	1	0	0
+NVIDIA GTX 280							.*NVIDIA .*GTX *28.*					4	1	1	3.3
+NVIDIA GTX 290							.*NVIDIA .*GTX *29.*					5	1	0	0
+NVIDIA 310								.*NVIDIA .*GeForce 310.*				3	1	1	3.3
+NVIDIA 315								.*NVIDIA .*GeForce 315.*				3	1	1	3.3
+NVIDIA GT 320							.*NVIDIA .*GT *32.*						3	1	0	0
+NVIDIA GT 330							.*NVIDIA .*GT *33.*						3	1	0	0
+NVIDIA GT 340							.*NVIDIA .*GT *34.*						3	1	0	0
+NVIDIA 405								.*NVIDIA .* 405.*						3	1	0	0
+NVIDIA GT 420							.*NVIDIA .*GT *42.*						3	1	1	4.2
+NVIDIA GT 430							.*NVIDIA .*GT *43.*						3	1	1	4.1
+NVIDIA GT 440							.*NVIDIA .*GT *44.*						4	1	0	0
+NVIDIA GTS 450							.*NVIDIA .*GTS *45.*					4	1	1	4.2
 NVIDIA GTX 460							.*NVIDIA .*GTX *46.*					5	1	1	4.2
-NVIDIA GTX 470M							.*NVIDIA .*GTX *470M.*					3	1	0	0
 NVIDIA GTX 470							.*NVIDIA .*GTX *47.*					5	1	1	4.2
-NVIDIA GTX 480M							.*NVIDIA .*GTX *480M.*					3	1	1	4.2
-NVIDIA GTX 485M							.*NVIDIA .*GTX *485M.*					3	1	0	0
 NVIDIA GTX 480							.*NVIDIA .*GTX *48.*					5	1	1	4.2
-NVIDIA GTX 530							.*NVIDIA .*GTX *53.*					3	1	0	0
+NVIDIA 510								.*NVIDIA .* 510.*						3	1	0	0
+NVIDIA GT 520							.*NVIDIA .*GT *52.*						3	1	1	4.2
+NVIDIA GT 530							.*NVIDIA .*GT *53.*						3	1	1	4.2
+NVIDIA GT 540							.*NVIDIA .*GT *54.*						3	1	1	4.2
 NVIDIA GTX 550							.*NVIDIA .*GTX *55.*					5	1	1	4.2
 NVIDIA GTX 560							.*NVIDIA .*GTX *56.*					5	1	1	4.2
 NVIDIA GTX 570							.*NVIDIA .*GTX *57.*					5	1	1	4.2
-NVIDIA GTX 580M							.*NVIDIA .*GTX *580M.*					5	1	1	4.2
 NVIDIA GTX 580							.*NVIDIA .*GTX *58.*					5	1	1	4.2
 NVIDIA GTX 590							.*NVIDIA .*GTX *59.*					5	1	1	4.2
+NVIDIA GT 610							.*NVIDIA .*GT *61.*						3	1	1	4.2
+NVIDIA GT 620							.*NVIDIA .*GT *62.*						3	1	0	0
+NVIDIA GT 630							.*NVIDIA .*GT *63.*						3	1	0	0
+NVIDIA GT 640							.*NVIDIA .*GT *64.*						3	1	0	0
+NVIDIA GT 650							.*NVIDIA .*GT *65.*						3	1	1	4.2
+NVIDIA GTX 660							.*NVIDIA .*GTX *66.*					5	1	0	0
+NVIDIA GTX 670							.*NVIDIA .*GTX *67.*					5	1	1	4.2
+NVIDIA GTX 680							.*NVIDIA .*GTX *68.*					5	1	1	4.2
+NVIDIA GTX 690							.*NVIDIA .*GTX *69.*					5	1	1	4.2
 NVIDIA C51								.*NVIDIA .*C51.*						0	1	1	2
 NVIDIA G72								.*NVIDIA .*G72.*						1	1	0	0
 NVIDIA G73								.*NVIDIA .*G73.*						1	1	0	0
@@ -412,7 +420,7 @@ NVIDIA G86								.*NVIDIA .*G86.*						3	1	0	0
 NVIDIA G92								.*NVIDIA .*G92.*						3	1	0	0
 NVIDIA GeForce							.*GeForce 256.*							0	0	0	0
 NVIDIA GeForce 2						.*GeForce ?2 ?.*						0	1	1	1.5
-NVIDIA GeForce 3						.*GeForce ?3 ?.*						0	1	1	1.5
+NVIDIA GeForce 3						.*GeForce ?3 ?.*						2	1	1	2.1
 NVIDIA GeForce 3 Ti						.*GeForce ?3 Ti.*						0	1	0	0
 NVIDIA GeForce 4						.*NVIDIA .*GeForce ?4.*					0	1	1	1.5
 NVIDIA GeForce 4 Go						.*NVIDIA .*GeForce ?4.*Go.*				0	1	0	0
@@ -420,7 +428,7 @@ NVIDIA GeForce 4 MX						.*NVIDIA .*GeForce ?4 MX.*				0	1	0	0
 NVIDIA GeForce 4 PCX					.*NVIDIA .*GeForce ?4 PCX.*				0	1	0	0
 NVIDIA GeForce 4 Ti						.*NVIDIA .*GeForce ?4 Ti.*				0	1	0	0
 NVIDIA GeForce 6100						.*NVIDIA .*GeForce 61.*					3	1	1	4.2
-NVIDIA GeForce 6200						.*NVIDIA .*GeForce 62.*					0	1	0	0
+NVIDIA GeForce 6200						.*NVIDIA .*GeForce 62.*					0	1	1	2.1
 NVIDIA GeForce 6500						.*NVIDIA .*GeForce 65.*					1	1	1	2.1
 NVIDIA GeForce 6600						.*NVIDIA .*GeForce 66.*					2	1	1	2.1
 NVIDIA GeForce 6700						.*NVIDIA .*GeForce 67.*					2	1	1	2.1
@@ -497,7 +505,7 @@ NVIDIA D9M								.*NVIDIA .*D9M.*						1	1	0	0
 NVIDIA G94								.*NVIDIA .*G94.*						3	1	0	0
 NVIDIA GeForce Go 6						.*GeForce Go 6.*						1	1	0	0
 NVIDIA ION 2							.*NVIDIA .*ION 2.*						2	1	0	0
-NVIDIA ION 								.*NVIDIA Corporation.*ION.*				2	1	0	0
+NVIDIA ION 								.*NVIDIA Corporation.*ION.*				2	1	1	0
 NVIDIA NB8M								.*NVIDIA .*NB8M.*						1	1	0	0
 NVIDIA NB8P								.*NVIDIA .*NB8P.*						2	1	0	0
 NVIDIA NB9E								.*NVIDIA .*NB9E.*						3	1	0	0
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index dfd4981946..4493343906 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -783,7 +783,7 @@ void send_stats()
 		"%-6s Class %d ",
 		gGLManager.mGLVendorShort.substr(0,6).c_str(),
 		(S32)LLFeatureManager::getInstance()->getGPUClass())
-		+ LLFeatureManager::getInstance()->getGPUString();
+		+ gGLManager.getRawGLString();
 
 	system["gpu"] = gpu_desc;
 	system["gpu_class"] = (S32)LLFeatureManager::getInstance()->getGPUClass();