diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
| commit | 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 (patch) | |
| tree | 3136e0a32cdcb1d55a4c3a5a67791ca128d947a5 /indra/newview/skins/default/xui/it/floater_joystick.xml | |
| parent | 93cf3d89e51835dd2f61c32b16191ab724528055 (diff) | |
svn merge -r121194:121210
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
Diffstat (limited to 'indra/newview/skins/default/xui/it/floater_joystick.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/floater_joystick.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_joystick.xml b/indra/newview/skins/default/xui/it/floater_joystick.xml index 13e81978ef..dcd637f199 100644 --- a/indra/newview/skins/default/xui/it/floater_joystick.xml +++ b/indra/newview/skins/default/xui/it/floater_joystick.xml @@ -71,6 +71,8 @@ Angolo morto dello zoom </text> <button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults"/> + <button label="OK" label_selected="OK" name="ok_btn"/> + <button label="Annulla" label_selected="Annulla" name="cancel_btn"/> <string name="JoystickMonitor"> Monitor del Joystick </string> |