From 3f172058897c1d7dbee73a72ddd4f8890727f9ca Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 26 Jun 2012 12:27:08 -0700
Subject: Some clean-up after checking the differences between the pathfinding
 branch and viewer-release.

---
 indra/newview/app_settings/cmd_line.xml | 22 ----------------------
 indra/newview/app_settings/commands.xml | 30 ------------------------------
 2 files changed, 52 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 2853c7383d..711191128b 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -164,28 +164,6 @@
       <string>UserLoginInfo</string>
     </map>
 
-    <key>loginpage</key>
-    <map>
-      <key>desc</key>
-      <string>Login authentication page to use.</string>
-      <key>count</key>
-      <integer>1</integer>
-      <key>map-to</key>
-      <string>LoginPage</string>
-    </map>
-    
-    <key>loginuri</key>
-    <map>
-      <key>desc</key>
-      <string>login server and CGI script to use</string>
-      <key>count</key>
-      <integer>1</integer>
-      <key>compose</key>
-      <boolean>true</boolean>
-      <key>map-to</key>
-      <string>CmdLineLoginURI</string>
-    </map>
-
     <key>logmetrics</key>
     <map>
       <key>desc</key>
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index cb6bdc627f..73df064ab2 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -157,36 +157,6 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="people"
            />
-  <command name="pathfinding_console"
-           available_in_toybox="false"
-           icon="Command_Pathfinding_Icon"
-           label_ref="Command_Pathfinding_Label"
-           tooltip_ref="Command_Pathfinding_Tooltip"
-           execute_function="Floater.ToggleOrBringToFront"
-           execute_parameters="pathfinding_console"
-           is_running_function="Floater.IsOpen"
-           is_running_parameters="pathfinding_console"
-           />
-  <command name="pathfinding_characters"
-           available_in_toybox="false"
-           icon="Command_PF_Characters_Icon"
-           label_ref="Command_PF_Characters_Label"
-           tooltip_ref="Command_PF_Characters_Tooltip"
-           execute_function="Floater.ToggleOrBringToFront"
-           execute_parameters="pathfinding_characters"
-           is_running_function="Floater.IsOpen"
-           is_running_parameters="pathfinding_characters"
-           />
-  <command name="pathfinding_linksets"
-           available_in_toybox="false"
-           icon="Command_PF_Linksets_Icon"
-           label_ref="Command_PF_Linksets_Label"
-           tooltip_ref="Command_PF_Linksets_Tooltip"
-           execute_function="Floater.ToggleOrBringToFront"
-           execute_parameters="pathfinding_linksets"
-           is_running_function="Floater.IsOpen"
-           is_running_parameters="pathfinding_linksets"
-           />
   <command name="picks"
            available_in_toybox="true"
            icon="Command_Picks_Icon"
-- 
cgit v1.2.3