diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-19 13:58:19 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-19 13:58:19 -0700 |
| commit | 3e61b37258fc88916d45ee47a2a9fbb3baf934cf (patch) | |
| tree | 73aa2e6e90c4afe8221a977827532374db5a506f /indra/newview/skins/default/xui/en/floater_camera.xml | |
| parent | 11bad6f75cf380e94805c097e68b41259e7d7b4f (diff) | |
| parent | e2b0e8fb1c3f1bcde01e283d2e6fcfc6b2b315eb (diff) | |
hg merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_camera.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_camera.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 6f6ddd95fa..e7f5207271 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -167,14 +167,10 @@ <joystick_rotate follows="top|left" height="78" - image_selected="Cam_Rotate_In" - image_unselected="Cam_Rotate_Out" layout="topleft" left="7" - mouse_opaque="false" name="cam_rotate_stick" quadrant="left" - scale_image="false" sound_flags="3" visible="true" tool_tip="Orbit camera around focus" |