From eef9016ca15631783e0d61b98da858a971b2ab72 Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Fri, 3 Jun 2011 19:43:13 -0400 Subject: Added tag DRTVWR-61_2.7.1-beta1, 2.7.1-beta1 for changeset 0c4d0c242780 --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index ba30e72b5f..41041fd32d 100644 --- a/.hgtags +++ b/.hgtags @@ -130,3 +130,5 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release 77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-beta1 8835e0e3c0d3a48244c287bc05811dfc2fba43ec 2.7.0-start 54fd44ac92e4c61435ea33effe093a3527e18d98 2.7.1-start +0c4d0c24278074f219e5a32e72b449e78301d11b DRTVWR-61_2.7.1-beta1 +0c4d0c24278074f219e5a32e72b449e78301d11b 2.7.1-beta1 -- cgit v1.2.3 From 4a8109476cfdb1505e9dc122526caacd6cdda374 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 6 Jun 2011 17:16:14 -0400 Subject: STORM-1618: re-enable deferred rendering on ATI Macs --- indra/newview/featuretable_mac.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index 45090c4c31..e2b979d9e9 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 24 +version 23 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table @@ -282,7 +282,6 @@ list TexUnit8orLess RenderDeferredSSAO 0 0 list ATI -RenderDeferred 0 0 RenderDeferredSSAO 0 0 list Intel -- cgit v1.2.3