diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-05-27 11:02:59 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-05-27 11:02:59 +0300 |
| commit | 990e31bb692b62e05f6065b04207acb8ca50cce4 (patch) | |
| tree | 8bb88d17e763d1a0be37f3c3ff1056f5306a4e77 /indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml | |
| parent | 46de549bfba0b95b068b617026e095404ccff2f6 (diff) | |
| parent | f33fdbf0ef25c485bdd09faaf1177d2b2b1a7694 (diff) | |
Merge from default branch.
Incoming changes in (924d091c166c) moved SidebarCameraMovement logic out of special widget to camera setup code
are reset changes in (380b2422b864) EXT-7434 FIX Worldview rect wasn't updated when "SidebarCameraMovement" variable
But seems bug is not reproduced.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml index 97f5d1ad91..2a7691ea0a 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml @@ -13,6 +13,7 @@ </text> <check_box label="Construire/Éditer" name="edit_camera_movement" tool_tip="Utilisez le positionnement automatique de la caméra quand vous accédez au mode de modification et quand vous le quittez"/> <check_box label="Apparence" name="appearance_camera_movement" tool_tip="Utiliser le positionnement automatique de la caméra quand je suis en mode Édition"/> + <check_box initial_value="1" label="Panneau latéral" name="appearance_sidebar_positioning" tool_tip="Positionnement auto de la caméra pour le panneau latéral"/> <check_box label="Afficher en vue subjective" name="first_person_avatar_visible"/> <check_box label="Les touches de direction me font toujours me déplacer" name="arrow_keys_move_avatar_check"/> <check_box label="Appuyer deux fois et maintenir enfoncé pour courir" name="tap_tap_hold_to_run"/> |