summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-12-04 16:33:44 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-12-04 16:33:44 -0500
commit68fffbc5e3562a81b2ff5f2eaec81c85e648a401 (patch)
treea5fe6450ce10798df8e043f42e5403dc3b69c767
parenta15ec8d014307da35b792659964cd5478d1aafe7 (diff)
parenta2bdc1d2d3abdc8ee09ded68185b10070b17d979 (diff)
merge changes for MAINT-1953
-rwxr-xr-x.hgtags1
-rw-r--r--indra/newview/gpu_table.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 9e61f184f3..9feb4e8b72 100755
--- a/.hgtags
+++ b/.hgtags
@@ -369,3 +369,4 @@ f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246
7c7d57d393e8ae7b61623279de06eb4a62ccae6a DRTVWR-249
f72b50ef168c159d6e79e97aa2bcafaf8577ab99 DRTVWR-230
b418be80903520c492e1173f3afbc4021cad5d07 DRTVWR-255
+965b9a35e260c0f53be1a25f0db7abc8a67eaf47 DRTVWR-252
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 5e8189caa5..21c3cff952 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -375,6 +375,7 @@ 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 GT 230 .*NVIDIA .*GT *23.* 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 GTX 260 .*NVIDIA .*GTX *26.* 4 1 1 3.3