From eb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Tue, 4 Aug 2009 01:12:59 +0000
Subject: svn merge -r 128442:129343
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

---
 .../skins/default/xui/en/floater_preferences.xml   | 58 +---------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_preferences.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 8a76c2167f..d9602c75ee 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -101,68 +101,12 @@
          label="Move, not to Advanced"
          layout="topleft"
          name="advanced2" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_advanced3.xml"
-         label="Not in specs"
-         layout="topleft"
-         name="advanced3" />
         <panel
 		 class="panel_preference"
          filename="panel_preferences_advanced4.xml"
          label="Storage/Kill"
          layout="topleft"
          name="advanced4" />
-        <!--panel
-		 class="panel_preference"
-         filename="panel_preferences_network.xml"
-         label="Network"
-         layout="topleft"
-         name="network" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_web.xml"
-         label="Web"
-         layout="topleft"
-         name="web" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_voice.xml"
-         label="Voice Chat"
-         layout="topleft"
-         name="voice" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_skins.xml"
-         label="Skins"
-         layout="topleft"
-         name="skins" /-->
     </tab_container>
-    
-        <!--button
-     follows="left|bottom"
-     height="20"
-     label="About"
-     label_selected="About"
-     layout="topleft"
-     left_delta="-512"
-     name="About..."
-     top_delta="0"
-     width="90">
-        <button.commit_callback
-         function="Floater.Show"
-         parameter="sl_about" />
-    </button-->
-    <!--bottom"
-     height="20"
-     help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417"
-     label="Help"
-     label_selected="Help"
-     layout="topleft"
-     left_pad="3"
-     name="Help"
-     top_delta="0"
-     width="90" /-->
-
-    
+     
 </floater>
-- 
cgit v1.2.3