diff --git a/indra/newview/app_settings/keysCamOnly.ini b/indra/newview/app_settings/keysCamOnly.ini
index 9b2d90b60..b8c4ec72c 100644
--- a/indra/newview/app_settings/keysCamOnly.ini
+++ b/indra/newview/app_settings/keysCamOnly.ini
@@ -15,49 +15,49 @@
 # Control is reserved for user commands.
 # function must be a function named in llkeyboard.cpp
 
-# Camera pans without anything held
-THIRD_PERSON	A		NONE		pan_left
-THIRD_PERSON	D		NONE		pan_right
-THIRD_PERSON	W		NONE		pan_in
-THIRD_PERSON	S		NONE		pan_out
-THIRD_PERSON	E		NONE		pan_up
-THIRD_PERSON	C		NONE		pan_down
+# Camera works with focus on without anything held
+THIRD_PERSON	LEFT		NONE		spin_around_cw
+THIRD_PERSON	RIGHT		NONE		spin_around_ccw
+THIRD_PERSON	UP		NONE		move_forward
+THIRD_PERSON	DOWN		NONE		move_backward
+THIRD_PERSON	PGUP		NONE		spin_over
+THIRD_PERSON	PGDN		NONE		spin_under
 
-THIRD_PERSON	LEFT		NONE		pan_left
-THIRD_PERSON	RIGHT		NONE		pan_right
-THIRD_PERSON	UP		NONE		pan_in
-THIRD_PERSON	DOWN		NONE		pan_out
-THIRD_PERSON	PGUP		NONE		pan_up
-THIRD_PERSON	PGDN		NONE		pan_down
+THIRD_PERSON	A		NONE		spin_around_cw
+THIRD_PERSON	D		NONE		spin_around_ccw
+THIRD_PERSON	W		NONE		move_forward
+THIRD_PERSON	S		NONE		move_backward
+THIRD_PERSON	E		NONE		spin_over
+THIRD_PERSON	C		NONE		spin_under
 
-THIRD_PERSON	PAD_LEFT	NONE		pan_left
-THIRD_PERSON	PAD_RIGHT	NONE		pan_right
-THIRD_PERSON	PAD_UP		NONE		pan_in
-THIRD_PERSON	PAD_DOWN	NONE		pan_out
-THIRD_PERSON	PAD_PGUP	NONE		pan_up
-THIRD_PERSON	PAD_PGDN	NONE		pan_down
+THIRD_PERSON	PAD_LEFT	NONE		spin_around_cw
+THIRD_PERSON	PAD_RIGHT	NONE		spin_around_ccw
+THIRD_PERSON	PAD_UP		NONE		move_forward
+THIRD_PERSON	PAD_DOWN	NONE		move_backward
+THIRD_PERSON	PAD_PGUP	NONE		spin_over
+THIRD_PERSON	PAD_PGDN	NONE		spin_under
 
-# Camera spins with shift
-THIRD_PERSON	A		SHIFT		spin_around_cw
-THIRD_PERSON	D		SHIFT		spin_around_ccw
-THIRD_PERSON	W		SHIFT		spin_over
-THIRD_PERSON	S		SHIFT		spin_under
-THIRD_PERSON	E		SHIFT		spin_over
-THIRD_PERSON	C		SHIFT		spin_under
+# Camera pans with shift
+THIRD_PERSON	A		SHIFT		pan_left
+THIRD_PERSON	D		SHIFT		pan_right
+THIRD_PERSON	W		SHIFT		pan_in
+THIRD_PERSON	S		SHIFT		pan_out
+THIRD_PERSON	E		SHIFT		pan_up
+THIRD_PERSON	C		SHIFT		pan_down
 
-THIRD_PERSON	LEFT		SHIFT		spin_around_cw
-THIRD_PERSON	RIGHT		SHIFT		spin_around_ccw
-THIRD_PERSON	UP		SHIFT		spin_over
-THIRD_PERSON	DOWN		SHIFT		spin_under
-THIRD_PERSON	PGUP		SHIFT		spin_over
-THIRD_PERSON	PGDN		SHIFT		spin_under
+THIRD_PERSON	LEFT		SHIFT		pan_left
+THIRD_PERSON	RIGHT		SHIFT		pan_right
+THIRD_PERSON	UP		SHIFT		pan_in
+THIRD_PERSON	DOWN		SHIFT		pan_out
+THIRD_PERSON	PGUP		SHIFT		pan_up
+THIRD_PERSON	PGDN		SHIFT		pan_down
 
-THIRD_PERSON	PAD_LEFT	SHIFT		spin_around_cw
-THIRD_PERSON	PAD_RIGHT	SHIFT		spin_around_ccw
-THIRD_PERSON	PAD_UP		SHIFT		spin_over
-THIRD_PERSON	PAD_DOWN	SHIFT		spin_under
-THIRD_PERSON	PAD_PGUP	SHIFT		spin_over
-THIRD_PERSON	PAD_PGDN	SHIFT		spin_under
+THIRD_PERSON	PAD_LEFT	SHIFT		pan_left
+THIRD_PERSON	PAD_RIGHT	SHIFT		pan_right
+THIRD_PERSON	PAD_UP		SHIFT		pan_in
+THIRD_PERSON	PAD_DOWN	SHIFT		pan_out
+THIRD_PERSON	PAD_PGUP	SHIFT		pan_up
+THIRD_PERSON	PAD_PGDN	SHIFT		pan_down
 
 # Camera works with focus on alt
 THIRD_PERSON	LEFT		ALT		spin_around_cw
diff --git a/indra/newview/app_settings/keysCamOnlyZQSD.ini b/indra/newview/app_settings/keysCamOnlyZQSD.ini
index 0286067a0..524a657f8 100644
--- a/indra/newview/app_settings/keysCamOnlyZQSD.ini
+++ b/indra/newview/app_settings/keysCamOnlyZQSD.ini
@@ -15,49 +15,49 @@
 # Control is reserved for user commands.
 # function must be a function named in llkeyboard.cpp
 
-# Camera pans without anything held
-THIRD_PERSON	Q		NONE		pan_left
-THIRD_PERSON	D		NONE		pan_right
-THIRD_PERSON	Z		NONE		pan_in
-THIRD_PERSON	S		NONE		pan_out
-THIRD_PERSON	E		NONE		pan_up
-THIRD_PERSON	C		NONE		pan_down
+# Camera works with focus on without anything held
+THIRD_PERSON	LEFT		NONE		spin_around_cw
+THIRD_PERSON	RIGHT		NONE		spin_around_ccw
+THIRD_PERSON	UP		NONE		move_forward
+THIRD_PERSON	DOWN		NONE		move_backward
+THIRD_PERSON	PGUP		NONE		spin_over
+THIRD_PERSON	PGDN		NONE		spin_under
 
-THIRD_PERSON	LEFT		NONE		pan_left
-THIRD_PERSON	RIGHT		NONE		pan_right
-THIRD_PERSON	UP		NONE		pan_in
-THIRD_PERSON	DOWN		NONE		pan_out
-THIRD_PERSON	PGUP		NONE		pan_up
-THIRD_PERSON	PGDN		NONE		pan_down
+THIRD_PERSON	Q		NONE		spin_around_cw
+THIRD_PERSON	D		NONE		spin_around_ccw
+THIRD_PERSON	Z		NONE		move_forward
+THIRD_PERSON	S		NONE		move_backward
+THIRD_PERSON	E		NONE		spin_over
+THIRD_PERSON	C		NONE		spin_under
+                                    
+THIRD_PERSON	PAD_LEFT	NONE		spin_around_cw
+THIRD_PERSON	PAD_RIGHT	NONE		spin_around_ccw
+THIRD_PERSON	PAD_UP		NONE		move_forward
+THIRD_PERSON	PAD_DOWN	NONE		move_backward
+THIRD_PERSON	PAD_PGUP	NONE		spin_over
+THIRD_PERSON	PAD_PGDN	NONE		spin_under
 
-THIRD_PERSON	PAD_LEFT	NONE		pan_left
-THIRD_PERSON	PAD_RIGHT	NONE		pan_right
-THIRD_PERSON	PAD_UP		NONE		pan_in
-THIRD_PERSON	PAD_DOWN	NONE		pan_out
-THIRD_PERSON	PAD_PGUP	NONE		pan_up
-THIRD_PERSON	PAD_PGDN	NONE		pan_down
+# Camera pans with shift
+THIRD_PERSON	Q		SHIFT		pan_left
+THIRD_PERSON	D		SHIFT		pan_right
+THIRD_PERSON	Z		SHIFT		pan_in
+THIRD_PERSON	S		SHIFT		pan_out
+THIRD_PERSON	E		SHIFT		pan_up
+THIRD_PERSON	C		SHIFT		pan_down
 
-# Camera spins with shift
-THIRD_PERSON	Q		SHIFT		spin_around_cw
-THIRD_PERSON	D		SHIFT		spin_around_ccw
-THIRD_PERSON	Z		SHIFT		spin_over
-THIRD_PERSON	S		SHIFT		spin_under
-THIRD_PERSON	E		SHIFT		spin_over
-THIRD_PERSON	C		SHIFT		spin_under
+THIRD_PERSON	LEFT		SHIFT		pan_left
+THIRD_PERSON	RIGHT		SHIFT		pan_right
+THIRD_PERSON	UP		SHIFT		pan_in
+THIRD_PERSON	DOWN		SHIFT		pan_out
+THIRD_PERSON	PGUP		SHIFT		pan_up
+THIRD_PERSON	PGDN		SHIFT		pan_down
 
-THIRD_PERSON	LEFT		SHIFT		spin_around_cw
-THIRD_PERSON	RIGHT		SHIFT		spin_around_ccw
-THIRD_PERSON	UP		SHIFT		spin_over
-THIRD_PERSON	DOWN		SHIFT		spin_under
-THIRD_PERSON	PGUP		SHIFT		spin_over
-THIRD_PERSON	PGDN		SHIFT		spin_under
-
-THIRD_PERSON	PAD_LEFT	SHIFT		spin_around_cw
-THIRD_PERSON	PAD_RIGHT	SHIFT		spin_around_ccw
-THIRD_PERSON	PAD_UP		SHIFT		spin_over
-THIRD_PERSON	PAD_DOWN	SHIFT		spin_under
-THIRD_PERSON	PAD_PGUP	SHIFT		spin_over
-THIRD_PERSON	PAD_PGDN	SHIFT		spin_under
+THIRD_PERSON	PAD_LEFT	SHIFT		pan_left
+THIRD_PERSON	PAD_RIGHT	SHIFT		pan_right
+THIRD_PERSON	PAD_UP		SHIFT		pan_in
+THIRD_PERSON	PAD_DOWN	SHIFT		pan_out
+THIRD_PERSON	PAD_PGUP	SHIFT		pan_up
+THIRD_PERSON	PAD_PGDN	SHIFT		pan_down
 
 # Camera works with focus on alt
 THIRD_PERSON	LEFT		ALT		spin_around_cw