diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 20:29:00 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 20:29:00 +0300 |
| commit | 7717097f7cfa1deaa934b9846c22523f53c600d3 (patch) | |
| tree | 1241345d89a4fcec3bb3e4a8a8205d298439aafa /indra/newview/skins/default/xui/en | |
| parent | f08c8ef2082e193cf3822d76357b60f133130afc (diff) | |
SL-6109 Teleport and autopilot should not work in some cases
Hides teleport_to and walk_to also optimizes couple things.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/control_table_contents_camera.xml | 62 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml | 65 |
2 files changed, 62 insertions, 65 deletions
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml index aba81e3134..24cbb2b885 100644 --- a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml +++ b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml @@ -175,4 +175,66 @@ tool_tip="Camera spin around clockwise" value="Clockwise" /> </rows> + <rows + name="move_forward_sitting" + value="move_forward_sitting"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="Camera Forward Sitting" /> + </rows> + <rows + name="move_backward_sitting" + value="move_backward_sitting"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="Camera Backward Sitting" /> + </rows> + <rows + name="spin_over_sitting" + value="spin_over_sitting"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="Camera Spin Over Sitting" /> + </rows> + <rows + name="spin_under_sitting" + value="spin_under_sitting"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="Camera Spin Under Sitting" /> + </rows> + <rows + name="spin_around_ccw_sitting" + value="spin_around_ccw_sitting"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + tool_tip="Camera spin around counterclockwise sitting" + value="Counterclockwise Sitting" /> + </rows> + <rows + name="spin_around_cw_sitting" + value="spin_around_cw_sitting"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + tool_tip="Camera spin around clockwise sitting" + value="Clockwise Sitting" /> + </rows> </contents> diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml deleted file mode 100644 index 9334c6e179..0000000000 --- a/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<contents> - <rows - name="move_forward_sitting" - value="move_forward_sitting"> - <columns - column="lst_action" - font="SansSerif" - halign="left" - name="lst_action" - value="Camera Forward Sitting" /> - </rows> - <rows - name="move_backward_sitting" - value="move_backward_sitting"> - <columns - column="lst_action" - font="SansSerif" - halign="left" - name="lst_action" - value="Camera Backward Sitting" /> - </rows> - <rows - name="spin_over_sitting" - value="spin_over_sitting"> - <columns - column="lst_action" - font="SansSerif" - halign="left" - name="lst_action" - value="Camera Spin Over Sitting" /> - </rows> - <rows - name="spin_under_sitting" - value="spin_under_sitting"> - <columns - column="lst_action" - font="SansSerif" - halign="left" - name="lst_action" - value="Camera Spin Under Sitting" /> - </rows> - <rows - name="spin_around_ccw_sitting" - value="spin_around_ccw_sitting"> - <columns - column="lst_action" - font="SansSerif" - halign="left" - name="lst_action" - tool_tip="Camera spin around counterclockwise sitting" - value="Counterclockwise Sitting" /> - </rows> - <rows - name="spin_around_cw_sitting" - value="spin_around_cw_sitting"> - <columns - column="lst_action" - font="SansSerif" - halign="left" - name="lst_action" - tool_tip="Camera spin around clockwise sitting" - value="Clockwise Sitting" /> - </rows> -</contents> |