From 9d6a79efed0809a2d47cbcadc6c338b3a3f8ce92 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 11:28:54 -0800
Subject: SOCIAL-557 FIX Enable clickable URLS also killed forced bandwidth
 throttle settings from skylight

---
 indra/newview/CMakeLists.txt                    |  1 +
 indra/newview/app_settings/settings_minimal.xml | 31 -------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4acffeb66b..0308a59658 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1339,6 +1339,7 @@ set(viewer_APPSETTINGS_FILES
     app_settings/settings_crash_behavior.xml
     app_settings/settings_files.xml
     app_settings/settings_per_account.xml
+    app_settings/settings_minimal.xml
     app_settings/std_bump.ini
     app_settings/trees.xml
     app_settings/ultra_graphics.xml
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index b399716313..62b314d167 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -45,15 +45,6 @@
         <key>Value</key>
             <integer>1</integer>
         </map>
-    <key>DisableTextHyperlinkActions</key>
-        <map>
-        <key>Comment</key>
-            <string>Disable highlighting and linking of URLs in XUI text boxes</string>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>1</integer>
-        </map>
     <key>EnableGrab</key>
         <map>
         <key>Comment</key>
@@ -191,28 +182,6 @@
         <key>Value</key>
         <integer>0</integer>
       </map>
-      <key>ThrottleBandwidthKBPS</key>
-      <map>
-        <key>Comment</key>
-        <string>Maximum allowable downstream bandwidth (kilo bits per second)</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>F32</string>
-        <key>Value</key>
-        <real>1500.0</real>
-      </map>
-      <key>XferThrottle</key>
-      <map>
-        <key>Comment</key>
-        <string>Maximum allowable downstream bandwidth for asset transfers (bits per second)</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>F32</string>
-        <key>Value</key>
-        <real>450000.0</real>
-      </map>
       <key>ChatFontSize</key>
       <map>
         <key>Comment</key>
-- 
cgit v1.2.3