diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 22 | ||||
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 30 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 44 |
3 files changed, 22 insertions, 74 deletions
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" diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f144e9f007..0f3ae89fa8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13595,10 +13595,10 @@ <key>Value</key> <integer>0</integer> </map> - <key>RetrieveNeighboringRegion</key> + <key>PathfindingRetrieveNeighboringRegion</key> <map> <key>Comment</key> - <string>Download a neighboring region when visualize a navmesh (default val 99 is for the current region).</string> + <string>Download a neighboring region when visualizing a pathfinding navmesh (default val 99 means do not download neighbors).</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -13609,7 +13609,7 @@ <key>PathfindingNavMeshClear</key> <map> <key>Comment</key> - <string>Background color</string> + <string>Background color when displaying pathfinding navmesh.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13625,7 +13625,7 @@ <key>PathfindingWalkable</key> <map> <key>Comment</key> - <string>Walkable color</string> + <string>Color of walkable objects when displaying pathfinding navmesh object types.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13641,7 +13641,7 @@ <key>PathfindingObstacle</key> <map> <key>Comment</key> - <string>Obstacle color</string> + <string>Color of static obstacle objects when displaying pathfinding navmesh object types.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13657,7 +13657,7 @@ <key>PathfindingMaterial</key> <map> <key>Comment</key> - <string>Material volume color</string> + <string>Color of material volumes when displaying pathfinding navmesh object types.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13673,7 +13673,7 @@ <key>PathfindingExclusion</key> <map> <key>Comment</key> - <string>Exclusion volume color</string> + <string>Color of exclusion volumes when displaying pathfinding navmesh object types.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13689,7 +13689,7 @@ <key>PathfindingConnectedEdge</key> <map> <key>Comment</key> - <string>Connected edge color</string> + <string>Color of a connected (crossable) edge when displaying pathfinding navmesh.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13705,7 +13705,7 @@ <key>PathfindingBoundaryEdge</key> <map> <key>Comment</key> - <string>Boundary edge color</string> + <string>Color of a boundary (non-crossable) edge when displaying pathfinding navmesh.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13721,7 +13721,7 @@ <key>PathfindingHeatColorBase</key> <map> <key>Comment</key> - <string>Least walkable heat map color</string> + <string>Color of the least walkable value when displaying the pathfinding navmesh as a heatmap.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13737,7 +13737,7 @@ <key>PathfindingHeatColorMax</key> <map> <key>Comment</key> - <string>Most walkable heat map color</string> + <string>Color of the most walkable value when displaying the pathfinding navmesh as a heatmap.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13753,7 +13753,7 @@ <key>PathfindingFaceColor</key> <map> <key>Comment</key> - <string>Nav mesh color?</string> + <string>Color of the faces when displaying the default view of the pathfinding navmesh.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13766,10 +13766,10 @@ <real>1.0</real> </array> </map> - <key>PathfindingStarValidColor</key> + <key>PathfindingTestPathValidEndColor</key> <map> <key>Comment</key> - <string>yay!</string> + <string>Color of the pathfinding test-pathing tool end-point when the path is valid.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13782,10 +13782,10 @@ <real>1.0</real> </array> </map> - <key>PathfindingStarInvalidColor</key> + <key>PathfindingTestPathInvalidEndColor</key> <map> <key>Comment</key> - <string>yay!</string> + <string>Color of the pathfinding test-pathing tool end-point when the path is invalid.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13801,7 +13801,7 @@ <key>PathfindingTestPathColor</key> <map> <key>Comment</key> - <string>yay!</string> + <string>Color of the pathfinding test-path when the path is valid.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13817,7 +13817,7 @@ <key>PathfindingAmbiance</key> <map> <key>Comment</key> - <string>Ambiance of lit pathfinding displays.</string> + <string>Ambiance of lit pathfinding navmesh displays.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13829,7 +13829,7 @@ <key>PathfindingXRayTint</key> <map> <key>Comment</key> - <string>Amount to darken/lighten x-ray lines in pathfinding display</string> + <string>Amount to darken/lighten x-ray lines in pathfinding display.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13853,7 +13853,7 @@ <key>PathfindingXRayWireframe</key> <map> <key>Comment</key> - <string>Render pathfinding xray as a wireframe.</string> + <string>Render pathfinding navmesh xray as a wireframe.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13865,7 +13865,7 @@ <key>PathfindingLineWidth</key> <map> <key>Comment</key> - <string>Width of volume outlines in pathfinding display.</string> + <string>Width of volume outlines in pathfinding navmesh display.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -13922,7 +13922,7 @@ <key>PathfindingWaterColor</key> <map> <key>Comment</key> - <string>yay!</string> + <string>Color of water plane when displaying pathfinding navmesh.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> |