From 16baf6c9d43fc29e697b5a460439ca664897450c Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Mon, 28 Apr 2008 23:29:46 +0000
Subject: merge release-QAR-499 Viewer 1.20 RC 3 merge release-QAR-508 Viewer
 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release

---
 indra/newview/app_settings/settings.xml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 41566d68d0..73a832ead7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5829,7 +5829,7 @@
     <key>RenderUseCleverUI</key>
         <map>
         <key>Comment</key>
-            <string>Turns on the \"clever\" UI rendering optimization.  It's a known performace gain (and enabled by default) on apple.</string>
+            <string>Turns on the \"clever\" UI rendering optimization. It's a known performace gain on apple.</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>
@@ -9825,17 +9825,6 @@
                 <integer>0</integer>
             </array>
 	    </map>
-    <key>AlertedUnsupportedHardware</key>
-		<map>
-		<key>Comment</key>
-			<string>Toggle that lets us tell the user he's on old hardware only once</string>
-		<key>Persist</key>
-			<integer>1</integer>
-		<key>Type</key>
-			<string>Boolean</string>
-		<key>Value</key>
-			<integer>0</integer>
-		</map>
     <key>RenderFastAlpha</key>
 		<map>
 		<key>Comment</key>
-- 
cgit v1.2.3