Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint

# Conflicts:
#	indra/llcommon/llkeybind.cpp
#	indra/llcommon/llkeybind.h

44 files changed, 2125 insertions, 4621 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 1adc25090f..b3a014058a 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -376,7 +376,6 @@ set(viewer_SOURCE_FILES
     llinventoryobserver.cpp
     llinventorypanel.cpp
     lljoystickbutton.cpp
-    llkeyconflict.cpp
     lllandmarkactions.cpp
     lllandmarklist.cpp
     lllegacyatmospherics.cpp
@@ -557,7 +556,6 @@ set(viewer_SOURCE_FILES
     llsecapi.cpp
     llsechandler_basic.cpp
     llselectmgr.cpp
-    llsetkeybinddialog.cpp
     llsettingspicker.cpp
     llsettingsvo.cpp
     llshareavatarhandler.cpp
@@ -663,7 +661,7 @@ set(viewer_SOURCE_FILES
     llviewerjointattachment.cpp
     llviewerjointmesh.cpp
     llviewerjoystick.cpp
-    llviewerinput.cpp
+    llviewerkeyboard.cpp
     llviewerlayer.cpp
     llviewermedia.cpp
     llviewermedia_streamingaudio.cpp
@@ -1009,7 +1007,6 @@ set(viewer_HEADER_FILES
     llinventoryobserver.h
     llinventorypanel.h
     lljoystickbutton.h
-    llkeyconflict.h
     lllandmarkactions.h
     lllandmarklist.h
     lllightconstants.h
@@ -1180,7 +1177,6 @@ set(viewer_HEADER_FILES
     llsecapi.h
     llsechandler_basic.h
     llselectmgr.h
-    llsetkeybinddialog.h
     llsettingspicker.h
     llsettingsvo.h
     llsidepanelappearance.h
@@ -1288,7 +1284,7 @@ set(viewer_HEADER_FILES
     llviewerjointattachment.h
     llviewerjointmesh.h
     llviewerjoystick.h
-    llviewerinput.h
+    llviewerkeyboard.h
     llviewerlayer.h
     llviewermedia.h
     llviewermediafocus.h
@@ -1673,7 +1669,7 @@ set(viewer_APPSETTINGS_FILES
     app_settings/grass.xml
     app_settings/high_graphics.xml
     app_settings/ignorable_dialogs.xml
-    app_settings/key_bindings.xml
+    app_settings/keys.xml
     app_settings/keywords_lsl_default.xml
     app_settings/logcontrol.xml
     app_settings/low_graphics.xml
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 49df80bfeb..7d765dabde 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.4.4
+6.4.5
diff --git a/indra/newview/app_settings/key_bindings.xml b/indra/newview/app_settings/keys.xml
index dd74293644..a8037fec05 100644
--- a/indra/newview/app_settings/key_bindings.xml
+++ b/indra/newview/app_settings/keys.xml
@@ -28,12 +28,34 @@
     <binding key="PAD_ENTER" mask="NONE" command="start_chat"/>
     <binding key="PAD_DIVIDE" mask="NONE" command="start_gesture"/>
 
+    <binding key="A" mask="SHIFT" command="slide_left"/>
+    <binding key="D" mask="SHIFT" command="slide_right"/>
+    <binding key="W" mask="SHIFT" command="push_forward"/>
+    <binding key="S" mask="SHIFT" command="push_backward"/>
+    <binding key="E" mask="SHIFT" command="jump"/>
+    <binding key="C" mask="SHIFT" command="push_down"/>
+    <binding key="F" mask="SHIFT" command="toggle_fly"/>
+
     <binding key="SPACE" mask="NONE" command="stop_moving"/>
     <binding key="ENTER" mask="NONE" command="start_chat"/>
     <binding key="DIVIDE" mask="NONE" command="start_gesture"/>
 
-    <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/>
-    <binding key="" mask="NONE" mouse="LMB" command="walk_to"/>
+    <binding key="LEFT" mask="SHIFT" command="slide_left"/>
+    <binding key="RIGHT" mask="SHIFT" command="slide_right"/>
+    <binding key="UP" mask="SHIFT" command="push_forward"/>
+    <binding key="DOWN" mask="SHIFT" command="push_backward"/>
+    <binding key="PGUP" mask="SHIFT" command="jump"/>
+    <binding key="PGDN" mask="SHIFT" command="push_down"/>
+
+    <binding key="PAD_LEFT" mask="SHIFT" command="slide_left"/>
+    <binding key="PAD_RIGHT" mask="SHIFT" command="slide_right"/>
+    <binding key="PAD_UP" mask="SHIFT" command="push_forward"/>
+    <binding key="PAD_DOWN" mask="SHIFT" command="push_backward"/>
+    <binding key="PAD_PGUP" mask="SHIFT" command="jump"/>
+    <binding key="PAD_PGDN" mask="SHIFT" command="push_down"/>
+    <binding key="PAD_HOME" mask="SHIFT" command="toggle_fly"/>
+    <binding key="PAD_ENTER" mask="SHIFT" command="start_chat"/>
+    <binding key="PAD_DIVIDE" mask="SHIFT" command="start_gesture"/>
   </first_person>
   <third_person>
     <binding key="A" mask="NONE" command="turn_left"/>
@@ -42,10 +64,15 @@
     <binding key="D" mask="SHIFT" command="slide_right"/>
     <binding key="W" mask="NONE" command="push_forward"/>
     <binding key="S" mask="NONE" command="push_backward"/>
+    <binding key="W" mask="SHIFT" command="push_forward"/>
+    <binding key="S" mask="SHIFT" command="push_backward"/>
     <binding key="E" mask="NONE" command="jump"/>
     <binding key="C" mask="NONE" command="push_down"/>
+    <binding key="E" mask="SHIFT" command="jump"/>
+    <binding key="C" mask="SHIFT" command="push_down"/>
 
     <binding key="F" mask="NONE" command="toggle_fly"/>
+    <binding key="F" mask="SHIFT" command="toggle_fly"/>
 
     <binding key="SPACE" mask="NONE" command="stop_moving"/>
     <binding key="ENTER" mask="NONE" command="start_chat"/>
@@ -57,8 +84,13 @@
     <binding key="RIGHT" mask="SHIFT" command="slide_right"/>
     <binding key="UP" mask="NONE" command="push_forward"/>
     <binding key="DOWN" mask="NONE" command="push_backward"/>
+    <binding key="UP" mask="SHIFT" command="push_forward"/>
+    <binding key="DOWN" mask="SHIFT" command="push_backward"/>
     <binding key="PGUP" mask="NONE" command="jump"/>
     <binding key="PGDN" mask="NONE" command="push_down"/>
+    <binding key="PGUP" mask="SHIFT" command="jump"/>
+    <binding key="PGDN" mask="SHIFT" command="push_down"/>
+    <binding key="HOME" mask="SHIFT" command="toggle_fly"/>
     <binding key="HOME" mask="NONE" command="toggle_fly"/>
 
     <binding key="PAD_LEFT" mask="NONE" command="turn_left"/>
@@ -67,12 +99,20 @@
     <binding key="PAD_RIGHT" mask="SHIFT" command="slide_right"/>
     <binding key="PAD_UP" mask="NONE" command="push_forward"/>
     <binding key="PAD_DOWN" mask="NONE" command="push_backward"/>
+    <binding key="PAD_UP" mask="SHIFT" command="push_forward"/>
+    <binding key="PAD_DOWN" mask="SHIFT" command="push_backward"/>
     <binding key="PAD_PGUP" mask="NONE" command="jump"/>
     <binding key="PAD_PGDN" mask="NONE" command="push_down"/>
+    <binding key="PAD_PGUP" mask="SHIFT" command="jump"/>
+    <binding key="PAD_PGDN" mask="SHIFT" command="push_down"/>
     <binding key="PAD_HOME" mask="NONE" command="toggle_fly"/>
+    <binding key="PAD_HOME" mask="SHIFT" command="toggle_fly"/>
     <binding key="PAD_CENTER" mask="NONE" command="stop_moving"/>
+    <binding key="PAD_CENTER" mask="SHIFT" command="stop_moving"/>
     <binding key="PAD_ENTER" mask="NONE" command="start_chat"/>
+    <binding key="PAD_ENTER" mask="SHIFT" command="start_chat"/>
     <binding key="PAD_DIVIDE" mask="NONE" command="start_gesture"/>
+    <binding key="PAD_DIVIDE" mask="SHIFT" command="start_gesture"/>
 
     <!--Camera controls in third person on Alt-->
     <binding key="LEFT" mask="ALT" command="spin_around_cw"/>
@@ -99,14 +139,28 @@
     <binding key="PAD_DIVIDE" mask="ALT" command="start_gesture"/>
 
     <!--mimic alt zoom behavior with keyboard only-->
+    <binding key="A" mask="CTL_ALT" command="spin_around_cw"/>
+    <binding key="D" mask="CTL_ALT" command="spin_around_ccw"/>
     <binding key="W" mask="CTL_ALT" command="spin_over"/>
     <binding key="S" mask="CTL_ALT" command="spin_under"/>
+    <binding key="E" mask="CTL_ALT" command="spin_over"/>
+    <binding key="C" mask="CTL_ALT" command="spin_under"/>
 
+    <binding key="LEFT" mask="CTL_ALT" command="spin_around_cw"/>
+    <binding key="RIGHT" mask="CTL_ALT" command="spin_around_ccw"/>
     <binding key="UP" mask="CTL_ALT" command="spin_over"/>
     <binding key="DOWN" mask="CTL_ALT" command="spin_under"/>
+    <binding key="PGUP" mask="CTL_ALT" command="spin_over"/>
+    <binding key="PGDN" mask="CTL_ALT" command="spin_under"/>
 
+    <binding key="PAD_LEFT" mask="CTL_ALT" command="spin_around_cw"/>
+    <binding key="PAD_RIGHT" mask="CTL_ALT" command="spin_around_ccw"/>
     <binding key="PAD_UP" mask="CTL_ALT" command="spin_over"/>
     <binding key="PAD_DOWN" mask="CTL_ALT" command="spin_under"/>
+    <binding key="PAD_PGUP" mask="CTL_ALT" command="spin_over"/>
+    <binding key="PAD_PGDN" mask="CTL_ALT" command="spin_under"/>
+    <binding key="PAD_ENTER" mask="CTL_ALT" command="start_chat"/>
+    <binding key="PAD_DIVIDE" mask="CTL_ALT" command="start_gesture"/>
 
     <!--Therefore pan on Alt-Shift-->
     <binding key="A" mask="CTL_ALT_SHIFT" command="pan_left"/>
@@ -125,10 +179,63 @@
     <binding key="PAD_DOWN" mask="CTL_ALT_SHIFT" command="pan_down"/>
     <binding key="PAD_ENTER" mask="CTL_ALT_SHIFT" command="start_chat"/>
     <binding key="PAD_DIVIDE" mask="CTL_ALT_SHIFT" command="start_gesture"/>
-
-    <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/>
-    <binding key="" mask="NONE" mouse="LMB" command="walk_to"/>
   </third_person>
+
+  <!-- Basic editing camera control -->
+  <edit>
+    <binding key="A" mask="NONE" command="spin_around_cw"/>
+    <binding key="D" mask="NONE" command="spin_around_ccw"/>
+    <binding key="W" mask="NONE" command="move_forward"/>
+    <binding key="S" mask="NONE" command="move_backward"/>
+    <binding key="E" mask="NONE" command="spin_over"/>
+    <binding key="C" mask="NONE" command="spin_under"/>
+    <binding key="ENTER" mask="NONE" command="start_chat"/>
+    <binding key="DIVIDE" mask="NONE" command="start_gesture"/>
+    <binding key="PAD_ENTER" mask="NONE" command="start_chat"/>
+    <binding key="PAD_DIVIDE" mask="NONE" command="start_gesture"/>
+
+    <binding key="LEFT" mask="NONE" command="spin_around_cw"/>
+    <binding key="RIGHT" mask="NONE" command="spin_around_ccw"/>
+    <binding key="UP" mask="NONE" command="move_forward"/>
+    <binding key="DOWN" mask="NONE" command="move_backward"/>
+    <binding key="PGUP" mask="NONE" command="spin_over"/>
+    <binding key="PGDN" mask="NONE" command="spin_under"/>
+
+    <binding key="A" mask="SHIFT" command="pan_left"/>
+    <binding key="D" mask="SHIFT" command="pan_right"/>
+    <binding key="W" mask="SHIFT" command="pan_up"/>
+    <binding key="S" mask="SHIFT" command="pan_down"/>
+
+    <binding key="LEFT" mask="SHIFT" command="pan_left"/>
+    <binding key="RIGHT" mask="SHIFT" command="pan_right"/>
+    <binding key="UP" mask="SHIFT" command="pan_up"/>
+    <binding key="DOWN" mask="SHIFT" command="pan_down"/>
+
+    <!--Walking works with ALT held down.-->
+    <binding key="A" mask="ALT" command="slide_left"/>
+    <binding key="D" mask="ALT" command="slide_right"/>
+    <binding key="W" mask="ALT" command="push_forward"/>
+    <binding key="S" mask="ALT" command="push_backward"/>
+    <binding key="E" mask="ALT" command="jump"/>
+    <binding key="C" mask="ALT" command="push_down"/>
+
+    <binding key="LEFT" mask="ALT" command="slide_left"/>
+    <binding key="RIGHT" mask="ALT" command="slide_right"/>
+    <binding key="UP" mask="ALT" command="push_forward"/>
+    <binding key="DOWN" mask="ALT" command="push_backward"/>
+    <binding key="PGUP" mask="ALT" command="jump"/>
+    <binding key="PGDN" mask="ALT" command="push_down"/>
+    <binding key="HOME" mask="ALT" command="toggle_fly"/>
+
+    <binding key="PAD_LEFT" mask="ALT" command="slide_left"/>
+    <binding key="PAD_RIGHT" mask="ALT" command="slide_right"/>
+    <binding key="PAD_UP" mask="ALT" command="push_forward"/>
+    <binding key="PAD_DOWN" mask="ALT" command="push_backward"/>
+    <binding key="PAD_PGUP" mask="ALT" command="jump"/>
+    <binding key="PAD_PGDN" mask="ALT" command="push_down"/>
+    <binding key="PAD_ENTER" mask="ALT" command="start_chat"/>
+    <binding key="PAD_DIVIDE" mask="ALT" command="start_gesture"/>
+  </edit>
   <sitting>
     <binding key="A" mask="ALT" command="spin_around_cw"/>
     <binding key="D" mask="ALT" command="spin_around_ccw"/>
@@ -144,11 +251,15 @@
     <binding key="PGUP" mask="ALT" command="spin_over"/>
     <binding key="PGDN" mask="ALT" command="spin_under"/>
 
+    <binding key="A" mask="CTL_ALT" command="spin_around_cw"/>
+    <binding key="D" mask="CTL_ALT" command="spin_around_ccw"/>
     <binding key="W" mask="CTL_ALT" command="spin_over"/>
     <binding key="S" mask="CTL_ALT" command="spin_under"/>
     <binding key="E" mask="CTL_ALT" command="spin_over"/>
     <binding key="C" mask="CTL_ALT" command="spin_under"/>
 
+    <binding key="LEFT" mask="CTL_ALT" command="spin_around_cw"/>
+    <binding key="RIGHT" mask="CTL_ALT" command="spin_around_ccw"/>
     <binding key="UP" mask="CTL_ALT" command="spin_over"/>
     <binding key="DOWN" mask="CTL_ALT" command="spin_under"/>
     <binding key="PGUP" mask="CTL_ALT" command="spin_over"/>
@@ -183,23 +294,23 @@
     <binding key="A" mask="SHIFT" command="slide_left"/>
     <binding key="D" mask="SHIFT" command="slide_right"/>
     <binding key="W" mask="SHIFT" command="move_forward_sitting"/>
-    <binding key="S" mask="SHIFT" command="move_backward_sitting"/>
-    <binding key="E" mask="SHIFT" command="spin_over_sitting"/>
-    <binding key="C" mask="SHIFT" command="spin_under_sitting"/>
+	<binding key="S" mask="SHIFT" command="move_backward_sitting"/>
+	<binding key="E" mask="SHIFT" command="spin_over_sitting"/>
+	<binding key="C" mask="SHIFT" command="spin_under_sitting"/>
 
     <binding key="LEFT" mask="SHIFT" command="slide_left"/>
     <binding key="RIGHT" mask="SHIFT" command="slide_right"/>
     <binding key="UP" mask="SHIFT" command="move_forward_sitting"/>
-    <binding key="DOWN" mask="SHIFT" command="move_backward_sitting"/>
-    <binding key="PGUP" mask="SHIFT" command="spin_over_sitting"/>
-    <binding key="PGDN" mask="SHIFT" command="spin_under_sitting"/>
+	<binding key="DOWN" mask="SHIFT" command="move_backward_sitting"/>
+	<binding key="PGUP" mask="SHIFT" command="spin_over_sitting"/>
+	<binding key="PGDN" mask="SHIFT" command="spin_under_sitting"/>
 
     <binding key="PAD_LEFT" mask="SHIFT" command="slide_left"/>
     <binding key="PAD_RIGHT" mask="SHIFT" command="slide_right"/>
     <binding key="PAD_UP" mask="SHIFT" command="move_forward_sitting"/>
-    <binding key="PAD_DOWN" mask="SHIFT" command="move_backward_sitting"/>
-    <binding key="PAD_PGUP" mask="SHIFT" command="spin_over_sitting"/>
-    <binding key="PAD_PGDN" mask="SHIFT" command="spin_under_sitting"/> 
+	<binding key="PAD_DOWN" mask="SHIFT" command="move_backward_sitting"/>
+	<binding key="PAD_PGUP" mask="SHIFT" command="spin_over_sitting"/>
+	<binding key="PAD_PGDN" mask="SHIFT" command="spin_under_sitting"/> 
     <binding key="PAD_ENTER" mask="SHIFT" command="start_chat"/>
     <binding key="PAD_DIVIDE" mask="SHIFT" command="start_gesture"/>
 
@@ -223,9 +334,6 @@
 
     <binding key="ENTER" mask="NONE" command="start_chat"/>
     <binding key="DIVIDE" mask="NONE" command="start_gesture"/>
-
-    <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/>
-    <binding key="" mask="NONE" mouse="LMB" command="walk_to"/>
   </sitting>
   <edit_avatar>
     <!--Avatar editing camera controls-->
@@ -251,7 +359,5 @@
     <binding key="PAD_PGDN" mask="NONE" command="edit_avatar_spin_under"/>
     <binding key="PAD_ENTER" mask="NONE" command="start_chat"/>
     <binding key="PAD_DIVIDE" mask="NONE" command="start_gesture"/>
-
-    <binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/>
   </edit_avatar>
-</keys>
+</keys>
\ No newline at end of file
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 41e5171f19..62ae6ed5cd 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3542,7 +3542,7 @@
     <key>DoubleClickAutoPilot</key>
     <map>
       <key>Comment</key>
-      <string>(Obsolete)Enable double-click auto pilot</string>
+      <string>Enable double-click auto pilot</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -3553,13 +3553,13 @@
     <key>DoubleClickTeleport</key>
     <map>
       <key>Comment</key>
-      <string>Enable double-click to teleport where allowed (afects minimap and people panel)</string>
+      <string>Enable double-click to teleport where allowed</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>DoubleClickShowWorldMap</key>
     <map>
@@ -8274,7 +8274,7 @@
     <key>PushToTalkButton</key>
     <map>
       <key>Comment</key>
-      <string>(Obsolete)Which button or keyboard key is used for push-to-talk</string>
+      <string>Which button or keyboard key is used for push-to-talk</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -8434,7 +8434,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.125</real>
+    <real>0.02</real>
   </map>
   <key>MediaRollOffMin</key>
   <map>
@@ -8445,7 +8445,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>10.0</real>
+    <real>40.0</real>
   </map>
   <key>MediaRollOffMax</key>
   <map>
@@ -8456,7 +8456,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>30.0</real>
+    <real>80.0</real>
   </map>
   <key>RecentItemsSortOrder</key>
     <map>
@@ -15559,7 +15559,7 @@
     <key>ClickToWalk</key>
     <map>
       <key>Comment</key>
-      <string>(obsolete)Click in world to walk to location</string>
+      <string>Click in world to walk to location</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3ac8a4b997..fb9782a505 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -129,7 +129,7 @@
 #include "llcoros.h"
 #include "llexception.h"
 #if !LL_LINUX
-#include "cef/dullahan.h"
+#include "cef/dullahan_version.h"
 #include "vlc/libvlc_version.h"
 #endif // LL_LINUX
 
@@ -149,7 +149,7 @@
 #include "llapr.h"
 #include <boost/lexical_cast.hpp>
 
-#include "llviewerinput.h"
+#include "llviewerkeyboard.h"
 #include "lllfsthread.h"
 #include "llworkerthread.h"
 #include "lltexturecache.h"
@@ -1002,15 +1002,20 @@ bool LLAppViewer::init()
 	gGLManager.getGLInfo(gDebugInfo);
 	gGLManager.printGLInfoString();
 
-	// Load User's bindings
-	std::string key_bindings_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "key_bindings.xml");
-	if (!gDirUtilp->fileExists(key_bindings_file) || !gViewerInput.loadBindingsXML(key_bindings_file))
+	// Load Default bindings
+	std::string key_bindings_file = gDirUtilp->findFile("keys.xml",
+														gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, ""),
+														gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
+
+
+	if (!gViewerKeyboard.loadBindingsXML(key_bindings_file))
 	{
-		// Failed to load custom bindings, try default ones
-		key_bindings_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "key_bindings.xml");
-		if (!gViewerInput.loadBindingsXML(key_bindings_file))
+		std::string key_bindings_file = gDirUtilp->findFile("keys.ini",
+															gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, ""),
+															gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
+		if (!gViewerKeyboard.loadBindings(key_bindings_file))
 		{
-			LL_ERRS("InitInfo") << "Unable to open default key bindings from " << key_bindings_file << LL_ENDL;
+			LL_ERRS("InitInfo") << "Unable to open keys.ini" << LL_ENDL;
 		}
 	}
 
@@ -1445,7 +1450,6 @@ bool LLAppViewer::doFrame()
 			{
 				joystick->scanJoystick();
 				gKeyboard->scanKeyboard();
-                gViewerInput.scanMouse();
 			}
 
 			// Update state based on messages, user input, object idle.
@@ -3218,12 +3222,16 @@ LLSD LLAppViewer::getViewerInfo() const
 	cef_ver_codec << ".";
 	cef_ver_codec << DULLAHAN_VERSION_MINOR;
 	cef_ver_codec << ".";
+	cef_ver_codec << DULLAHAN_VERSION_POINT;
+	cef_ver_codec << ".";
 	cef_ver_codec << DULLAHAN_VERSION_BUILD;
 
-	cef_ver_codec << " / CEF: ";
+	cef_ver_codec << std::endl;
+	cef_ver_codec << "  CEF: ";
 	cef_ver_codec << CEF_VERSION;
 
-	cef_ver_codec << " / Chromium: ";
+	cef_ver_codec << std::endl;
+	cef_ver_codec << "  Chromium: ";
 	cef_ver_codec << CHROME_VERSION_MAJOR;
 	cef_ver_codec << ".";
 	cef_ver_codec << CHROME_VERSION_MINOR;
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 9fe19bd50e..712b41848c 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -71,9 +71,8 @@
 #include "lltrans.h"
 #include "llviewercontrol.h"
 #include "llviewercamera.h"
-#include "llviewereventrecorder.h"
-#include "llviewermessage.h"
 #include "llviewerwindow.h"
+#include "llviewermessage.h"
 #include "llviewershadermgr.h"
 #include "llviewerthrottle.h"
 #include "llvoavatarself.h"
@@ -160,6 +159,87 @@ struct LabelTable : public LLInitParam::Block<LabelTable>
     {}
 };
 
+class LLVoiceSetKeyDialog : public LLModalDialog
+{
+public:
+	LLVoiceSetKeyDialog(const LLSD& key);
+	~LLVoiceSetKeyDialog();
+	
+	/*virtual*/ BOOL postBuild();
+	
+	void setParent(LLFloaterPreference* parent) { mParent = parent; }
+	
+	BOOL handleKeyHere(KEY key, MASK mask);
+	BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down);
+	static void onCancel(void* user_data);
+		
+private:
+	LLFloaterPreference* mParent;
+};
+
+LLVoiceSetKeyDialog::LLVoiceSetKeyDialog(const LLSD& key)
+  : LLModalDialog(key),
+	mParent(NULL)
+{
+}
+
+//virtual
+BOOL LLVoiceSetKeyDialog::postBuild()
+{
+	childSetAction("Cancel", onCancel, this);
+	getChild<LLUICtrl>("Cancel")->setFocus(TRUE);
+	
+	gFocusMgr.setKeystrokesOnly(TRUE);
+	
+	return TRUE;
+}
+
+LLVoiceSetKeyDialog::~LLVoiceSetKeyDialog()
+{
+}
+
+BOOL LLVoiceSetKeyDialog::handleKeyHere(KEY key, MASK mask)
+{
+	BOOL result = TRUE;
+	
+	if (key == 'Q' && mask == MASK_CONTROL)
+	{
+		result = FALSE;
+	}
+	else if (mParent)
+	{
+		mParent->setKey(key);
+	}
+	closeFloater();
+	return result;
+}
+
+BOOL LLVoiceSetKeyDialog::handleAnyMouseClick(S32 x, S32 y, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down)
+{
+    BOOL result = FALSE;
+    if (down
+        && (clicktype == LLMouseHandler::CLICK_MIDDLE || clicktype == LLMouseHandler::CLICK_BUTTON4 || clicktype == LLMouseHandler::CLICK_BUTTON5)
+        && mask == 0)
+    {
+        mParent->setMouse(clicktype);
+        result = TRUE;
+        closeFloater();
+    }
+    else
+    {
+        result = LLMouseHandler::handleAnyMouseClick(x, y, mask, clicktype, down);
+    }
+
+    return result;
+}
+
+//static
+void LLVoiceSetKeyDialog::onCancel(void* user_data)
+{
+	LLVoiceSetKeyDialog* self = (LLVoiceSetKeyDialog*)user_data;
+	self->closeFloater();
+}
+
 
 // global functions 
 
@@ -239,6 +319,37 @@ void handleAppearanceCameraMovementChanged(const LLSD& newvalue)
 	}
 }
 
+/*bool callback_skip_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater)
+{
+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+	if (0 == option && floater )
+	{
+		if ( floater )
+		{
+			floater->setAllIgnored();
+		//	LLFirstUse::disableFirstUse();
+			floater->buildPopupLists();
+		}
+	}
+	return false;
+}
+
+bool callback_reset_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater)
+{
+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+	if ( 0 == option && floater )
+	{
+		if ( floater )
+		{
+			floater->resetAllIgnored();
+			//LLFirstUse::resetFirstUse();
+			floater->buildPopupLists();
+		}
+	}
+	return false;
+}
+*/
+
 void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator)
 {
 	numerator = 0;
@@ -263,7 +374,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mGotPersonalInfo(false),
 	mOriginalIMViaEmail(false),
 	mLanguageChanged(false),
-	mAvatarDataInitialized(false)
+	mAvatarDataInitialized(false),
+	mClickActionDirty(false)
 {
 	LLConversationLog::instance().addObserver(this);
 
@@ -272,7 +384,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	static bool registered_dialog = false;
 	if (!registered_dialog)
 	{
-		LLFloaterReg::add("keybind_dialog", "floater_select_key.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLSetKeyBindDialog>);
+		LLFloaterReg::add("voice_set_key", "floater_select_key.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLVoiceSetKeyDialog>);
 		registered_dialog = true;
 	}
 	
@@ -285,6 +397,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.ResetCache",				boost::bind(&LLFloaterPreference::onClickResetCache, this));
 	mCommitCallbackRegistrar.add("Pref.ClickSkin",				boost::bind(&LLFloaterPreference::onClickSkin, this,_1, _2));
 	mCommitCallbackRegistrar.add("Pref.SelectSkin",				boost::bind(&LLFloaterPreference::onSelectSkin, this));
+	mCommitCallbackRegistrar.add("Pref.VoiceSetKey",			boost::bind(&LLFloaterPreference::onClickSetKey, this));
+	mCommitCallbackRegistrar.add("Pref.VoiceSetMiddleMouse",	boost::bind(&LLFloaterPreference::onClickSetMiddleMouse, this));
 	mCommitCallbackRegistrar.add("Pref.SetSounds",				boost::bind(&LLFloaterPreference::onClickSetSounds, this));
 	mCommitCallbackRegistrar.add("Pref.ClickEnablePopup",		boost::bind(&LLFloaterPreference::onClickEnablePopup, this));
 	mCommitCallbackRegistrar.add("Pref.ClickDisablePopup",		boost::bind(&LLFloaterPreference::onClickDisablePopup, this));	
@@ -311,6 +425,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 
 	sSkin = gSavedSettings.getString("SkinCurrent");
 
+	mCommitCallbackRegistrar.add("Pref.ClickActionChange",		boost::bind(&LLFloaterPreference::onClickActionChange, this));
+
 	gSavedSettings.getControl("NameTagShowUsernames")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged,  _2));	
 	gSavedSettings.getControl("NameTagShowFriends")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged,  _2));	
 	gSavedSettings.getControl("UseDisplayNames")->getCommitSignal()->connect(boost::bind(&handleDisplayNamesOptionChanged,  _2));
@@ -577,6 +693,12 @@ void LLFloaterPreference::apply()
 	}
 
 	saveAvatarProperties();
+
+	if (mClickActionDirty)
+	{
+		updateClickActionSettings();
+		mClickActionDirty = false;
+	}
 }
 
 void LLFloaterPreference::cancel()
@@ -609,6 +731,12 @@ void LLFloaterPreference::cancel()
 	// reverts any changes to current skin
 	gSavedSettings.setString("SkinCurrent", sSkin);
 
+	if (mClickActionDirty)
+	{
+		updateClickActionControls();
+		mClickActionDirty = false;
+	}
+
 	LLFloaterPreferenceProxy * advanced_proxy_settings = LLFloaterReg::findTypedInstance<LLFloaterPreferenceProxy>("prefs_proxy");
 	if (advanced_proxy_settings)
 	{
@@ -690,6 +818,9 @@ void LLFloaterPreference::onOpen(const LLSD& key)
 	onChangeTextureFolder();
 	onChangeSoundFolder();
 	onChangeAnimationFolder();
+
+	// Load (double-)click to walk/teleport settings.
+	updateClickActionControls();
 	
 	// Enabled/disabled popups, might have been changed by user actions
 	// while preferences floater was closed.
@@ -1528,6 +1659,72 @@ void LLFloaterPreference::onChangeQuality(const LLSD& data)
 	refresh();
 }
 
+void LLFloaterPreference::onClickSetKey()
+{
+	LLVoiceSetKeyDialog* dialog = LLFloaterReg::showTypedInstance<LLVoiceSetKeyDialog>("voice_set_key", LLSD(), TRUE);
+	if (dialog)
+	{
+		dialog->setParent(this);
+	}
+}
+
+void LLFloaterPreference::setKey(KEY key)
+{
+	getChild<LLUICtrl>("modifier_combo")->setValue(LLKeyboard::stringFromKey(key));
+	// update the control right away since we no longer wait for apply
+	getChild<LLUICtrl>("modifier_combo")->onCommit();
+}
+
+void LLFloaterPreference::setMouse(LLMouseHandler::EClickType click)
+{
+    std::string bt_name;
+    std::string ctrl_value;
+    switch (click)
+    {
+        case LLMouseHandler::CLICK_MIDDLE:
+            bt_name = "middle_mouse";
+            ctrl_value = MIDDLE_MOUSE_CV;
+            break;
+        case LLMouseHandler::CLICK_BUTTON4:
+            bt_name = "button4_mouse";
+            ctrl_value = MOUSE_BUTTON_4_CV;
+            break;
+        case LLMouseHandler::CLICK_BUTTON5:
+            bt_name = "button5_mouse";
+            ctrl_value = MOUSE_BUTTON_5_CV;
+            break;
+        default:
+            break;
+    }
+
+    if (!ctrl_value.empty())
+    {
+        LLUICtrl* p2t_line_editor = getChild<LLUICtrl>("modifier_combo");
+        // We are using text control names for readability and compatibility with voice
+        p2t_line_editor->setControlValue(ctrl_value);
+        LLPanel* advanced_preferences = dynamic_cast<LLPanel*>(p2t_line_editor->getParent());
+        if (advanced_preferences)
+        {
+            p2t_line_editor->setValue(advanced_preferences->getString(bt_name));
+        }
+    }
+}
+
+void LLFloaterPreference::onClickSetMiddleMouse()
+{
+	LLUICtrl* p2t_line_editor = getChild<LLUICtrl>("modifier_combo");
+
+	// update the control right away since we no longer wait for apply
+	p2t_line_editor->setControlValue(MIDDLE_MOUSE_CV);
+
+	//push2talk button "middle mouse" control value is in English, need to localize it for presentation
+	LLPanel* advanced_preferences = dynamic_cast<LLPanel*>(p2t_line_editor->getParent());
+	if (advanced_preferences)
+	{
+		p2t_line_editor->setValue(advanced_preferences->getString("middle_mouse"));
+	}
+}
+
 void LLFloaterPreference::onClickSetSounds()
 {
 	// Disable Enable gesture sounds checkbox if the master sound is disabled 
@@ -1535,6 +1732,18 @@ void LLFloaterPreference::onClickSetSounds()
 	getChild<LLCheckBoxCtrl>("gesture_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds"));
 }
 
+/*
+void LLFloaterPreference::onClickSkipDialogs()
+{
+	LLNotificationsUtil::add("SkipShowNextTimeDialogs", LLSD(), LLSD(), boost::bind(&callback_skip_dialogs, _1, _2, this));
+}
+
+void LLFloaterPreference::onClickResetDialogs()
+{
+	LLNotificationsUtil::add("ResetShowNextTimeDialogs", LLSD(), LLSD(), boost::bind(&callback_reset_dialogs, _1, _2, this));
+}
+ */
+
 void LLFloaterPreference::onClickEnablePopup()
 {	
 	LLScrollListCtrl& disabled_popups = getChildRef<LLScrollListCtrl>("disabled_popups");
@@ -2014,6 +2223,11 @@ void LLFloaterPreference::onClickAdvanced()
 	}
 }
 
+void LLFloaterPreference::onClickActionChange()
+{
+	mClickActionDirty = true;
+}
+
 void LLFloaterPreference::onClickPermsDefault()
 {
 	LLFloaterReg::showInstance("perms_default");
@@ -2051,6 +2265,26 @@ void LLFloaterPreference::onLogChatHistorySaved()
 	}
 }
 
+void LLFloaterPreference::updateClickActionSettings()
+{
+	const int single_clk_action = getChild<LLComboBox>("single_click_action_combo")->getValue().asInteger();
+	const int double_clk_action = getChild<LLComboBox>("double_click_action_combo")->getValue().asInteger();
+
+	gSavedSettings.setBOOL("ClickToWalk",			single_clk_action == 1);
+	gSavedSettings.setBOOL("DoubleClickAutoPilot",	double_clk_action == 1);
+	gSavedSettings.setBOOL("DoubleClickTeleport",	double_clk_action == 2);
+}
+
+void LLFloaterPreference::updateClickActionControls()
+{
+	const bool click_to_walk = gSavedSettings.getBOOL("ClickToWalk");
+	const bool dbl_click_to_walk = gSavedSettings.getBOOL("DoubleClickAutoPilot");
+	const bool dbl_click_to_teleport = gSavedSettings.getBOOL("DoubleClickTeleport");
+
+	getChild<LLComboBox>("single_click_action_combo")->setValue((int)click_to_walk);
+	getChild<LLComboBox>("double_click_action_combo")->setValue(dbl_click_to_teleport ? 2 : (int)dbl_click_to_walk);
+}
+
 void LLFloaterPreference::applyUIColor(LLUICtrl* ctrl, const LLSD& param)
 {
 	LLUIColorTable::instance().setColor(param.asString(), LLColor4(ctrl->getValue()));
@@ -2232,6 +2466,25 @@ BOOL LLPanelPreference::postBuild()
 		getChild<LLTextBox>("mute_chb_label")->setClickedCallback(boost::bind(&toggleMuteWhenMinimized));
 	}
 
+	//////////////////////PanelAdvanced ///////////////////
+	if (hasChild("modifier_combo", TRUE))
+	{
+		//localizing if push2talk button is set to middle mouse
+		std::string modifier_value = getChild<LLUICtrl>("modifier_combo")->getValue().asString();
+		if (MIDDLE_MOUSE_CV == modifier_value)
+		{
+			getChild<LLUICtrl>("modifier_combo")->setValue(getString("middle_mouse"));
+		}
+		else if (MOUSE_BUTTON_4_CV == modifier_value)
+		{
+			getChild<LLUICtrl>("modifier_combo")->setValue(getString("button4_mouse"));
+		}
+		else if (MOUSE_BUTTON_5_CV == modifier_value)
+		{
+			getChild<LLUICtrl>("modifier_combo")->setValue(getString("button5_mouse"));
+		}
+	}
+
 	//////////////////////PanelSetup ///////////////////
 	if (hasChild("max_bandwidth"), TRUE)
 	{
@@ -2512,7 +2765,7 @@ void LLPanelPreferenceGraphics::setPresetText()
 		}
 	}
 
-    if (hasDirtyChilds() && !preset_graphic_active.empty())
+	if (hasDirtyChilds() && !preset_graphic_active.empty())
 	{
 		gSavedSettings.setString("PresetGraphicActive", "");
 		preset_graphic_active.clear();
@@ -2632,373 +2885,6 @@ void LLPanelPreferenceGraphics::setHardwareDefaults()
 	resetDirtyChilds();
 }
 
-//------------------------LLPanelPreferenceControls--------------------------------
-static LLPanelInjector<LLPanelPreferenceControls> t_pref_contrls("panel_preference_controls");
-
-LLPanelPreferenceControls::LLPanelPreferenceControls()
-    :LLPanelPreference(),
-    mEditingColumn(-1),
-    mEditingMode(0)
-{
-    // MODE_COUNT - 1 because there are currently no settings assigned to 'saved settings'.
-    for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i)
-    {
-        mConflictHandler[i].setLoadMode((LLKeyConflictHandler::ESourceMode)i);
-    }
-}
-
-LLPanelPreferenceControls::~LLPanelPreferenceControls()
-{
-}
-
-BOOL LLPanelPreferenceControls::postBuild()
-{
-    // populate list of controls
-    pControlsTable = getChild<LLScrollListCtrl>("controls_list");
-    pKeyModeBox = getChild<LLComboBox>("key_mode");
-
-    pControlsTable->setCommitCallback(boost::bind(&LLPanelPreferenceControls::onListCommit, this));
-    pKeyModeBox->setCommitCallback(boost::bind(&LLPanelPreferenceControls::onModeCommit, this));
-    getChild<LLButton>("restore_defaults")->setCommitCallback(boost::bind(&LLPanelPreferenceControls::onRestoreDefaultsBtn, this));
-
-    return TRUE;
-}
-
-void LLPanelPreferenceControls::regenerateControls()
-{
-    mEditingMode = pKeyModeBox->getValue().asInteger();
-    mConflictHandler[mEditingMode].loadFromSettings((LLKeyConflictHandler::ESourceMode)mEditingMode);
-    populateControlTable();
-}
-
-void LLPanelPreferenceControls::populateControlTable()
-{
-    pControlsTable->clearRows();
-    pControlsTable->clearColumns();
-
-    std::string filename;
-    switch ((LLKeyConflictHandler::ESourceMode)mEditingMode)
-    {
-    case LLKeyConflictHandler::MODE_THIRD_PERSON:
-    case LLKeyConflictHandler::MODE_FIRST_PERSON:
-    case LLKeyConflictHandler::MODE_EDIT_AVATAR:
-    case LLKeyConflictHandler::MODE_SITTING:
-        filename = "control_table_contents.xml";
-        break;
-    default:
-        // 'saved settings' mode doesn't have UI or actual settings yet
-        LL_INFOS() << "Unimplemented mode" << LL_ENDL;
-        return;
-    }
-
-    LLXMLNodePtr xmlNode;
-    LLScrollListCtrl::Contents contents;
-    if (!LLUICtrlFactory::getLayeredXMLNode(filename, xmlNode))
-    {
-    LL_WARNS() << "Failed to load " << filename << LL_ENDL;
-    return;
-    }
-    LLXUIParser parser;
-    parser.readXUI(xmlNode, contents, filename);
-
-    if (!contents.validateBlock())
-    {
-        return;
-    }
-
-    for (LLInitParam::ParamIterator<LLScrollListColumn::Params>::const_iterator col_it = contents.columns.begin();
-        col_it != contents.columns.end();
-        ++col_it)
-    {
-        pControlsTable->addColumn(*col_it);
-    }
-
-    LLScrollListCell::Params cell_params;
-    // init basic cell params
-    cell_params.font = LLFontGL::getFontSansSerif();
-    cell_params.font_halign = LLFontGL::LEFT;
-    cell_params.column = "";
-    cell_params.value = "";
-
-
-    for (LLInitParam::ParamIterator<LLScrollListItem::Params>::const_iterator row_it = contents.rows.begin();
-        row_it != contents.rows.end();
-        ++row_it)
-    {
-        std::string control = row_it->value.getValue().asString();
-        if (!control.empty() && control != "menu_separator")
-        {
-            // At the moment 4 collumns are hardcoded
-            LLScrollListItem::Params item_params(*row_it);
-            bool enabled = mConflictHandler[mEditingMode].canAssignControl(control);
-            item_params.enabled.setValue(enabled);
-            cell_params.column = "lst_ctrl1";
-            cell_params.value = mConflictHandler[mEditingMode].getControlString(control, 0);
-            item_params.columns.add(cell_params);
-            cell_params.column = "lst_ctrl2";
-            cell_params.value = mConflictHandler[mEditingMode].getControlString(control, 1);
-            item_params.columns.add(cell_params);
-            cell_params.column = "lst_ctrl3";
-            cell_params.value = mConflictHandler[mEditingMode].getControlString(control, 2);
-            item_params.columns.add(cell_params);
-            pControlsTable->addRow(item_params, EAddPosition::ADD_BOTTOM);
-        }
-        else
-        {
-            pControlsTable->addRow(*row_it, EAddPosition::ADD_BOTTOM);
-        }
-    }
-}
-
-// Just a workaround to not care about first separator before headers (we can start from random header)
-void LLPanelPreferenceControls::addSeparator()
-{
-    if (pControlsTable->getItemCount() > 0)
-    {
-        pControlsTable->addSeparator(EAddPosition::ADD_BOTTOM);
-    }
-}
-
-void LLPanelPreferenceControls::updateTable()
-{
-    mEditingControl.clear();
-    std::vector<LLScrollListItem*> list = pControlsTable->getAllData();
-    for (S32 i = 0; i < list.size(); ++i)
-    {
-        std::string control = list[i]->getValue();
-        if (!control.empty())
-        {
-            LLScrollListCell* cell = list[i]->getColumn(1);
-            cell->setValue(mConflictHandler[mEditingMode].getControlString(control, 0));
-            cell = list[i]->getColumn(2);
-            cell->setValue(mConflictHandler[mEditingMode].getControlString(control, 1));
-            cell = list[i]->getColumn(3);
-            cell->setValue(mConflictHandler[mEditingMode].getControlString(control, 2));
-        }
-    }
-    pControlsTable->deselectAllItems();
-}
-
-void LLPanelPreferenceControls::apply()
-{
-    for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i)
-    {
-        if (mConflictHandler[i].hasUnsavedChanges())
-        {
-            mConflictHandler[i].saveToSettings();
-        }
-    }
-}
-
-void LLPanelPreferenceControls::cancel()
-{
-    for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i)
-    {
-        if (mConflictHandler[i].hasUnsavedChanges())
-        {
-            mConflictHandler[i].clear();
-        }
-    }
-    pControlsTable->clear();
-}
-
-void LLPanelPreferenceControls::saveSettings()
-{
-    for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i)
-    {
-        if (mConflictHandler[i].hasUnsavedChanges())
-        {
-            mConflictHandler[i].saveToSettings();
-            mConflictHandler[i].clear();
-        }
-    }
-
-    S32 mode = pKeyModeBox->getValue().asInteger();
-    if (mConflictHandler[mode].empty())
-    {
-        regenerateControls();
-    }
-}
-
-void LLPanelPreferenceControls::resetDirtyChilds()
-{
-    regenerateControls();
-}
-
-void LLPanelPreferenceControls::onListCommit()
-{
-    LLScrollListItem* item = pControlsTable->getFirstSelected();
-    if (item == NULL)
-    {
-        return;
-    }
-
-    std::string control = item->getValue();
-
-    if (control.empty())
-    {
-        pControlsTable->deselectAllItems();
-        return;
-    }
-
-    if (!mConflictHandler[mEditingMode].canAssignControl(control))
-    {
-        pControlsTable->deselectAllItems();
-        return;
-    }
-
-    S32 cell_ind = item->getSelectedCell();
-    if (cell_ind <= 0)
-    {
-        pControlsTable->deselectAllItems();
-        return;
-    }
-
-    // List does not tell us what cell was clicked, so we have to figure it out manually, but
-    // fresh mouse coordinates are not yet accessible during onCommit() and there are other issues,
-    // so we cheat: remember item user clicked at, trigger 'key dialog' on hover that comes next,
-    // use coordinates from hover to calculate cell
-
-    LLScrollListCell* cell = item->getColumn(cell_ind);
-    if (cell)
-    {
-        LLSetKeyBindDialog* dialog = LLFloaterReg::getTypedInstance<LLSetKeyBindDialog>("keybind_dialog", LLSD());
-        if (dialog)
-        {
-            mEditingControl = control;
-            mEditingColumn = cell_ind;
-            dialog->setParent(this, pControlsTable, DEFAULT_KEY_FILTER);
-
-            LLFloater* root_floater = gFloaterView->getParentFloater(this);
-            if (root_floater)
-                root_floater->addDependentFloater(dialog);
-            dialog->openFloater();
-            dialog->setFocus(TRUE);
-        }
-    }
-    else
-    {
-        pControlsTable->deselectAllItems();
-    }
-}
-
-void LLPanelPreferenceControls::onModeCommit()
-{
-    mEditingMode = pKeyModeBox->getValue().asInteger();
-    if (mConflictHandler[mEditingMode].empty())
-    {
-        // opening for first time
-        mConflictHandler[mEditingMode].loadFromSettings((LLKeyConflictHandler::ESourceMode)mEditingMode);
-    }
-    populateControlTable();
-}
-
-void LLPanelPreferenceControls::onRestoreDefaultsBtn()
-{
-    LLNotificationsUtil::add("PreferenceControlsDefaults", LLSD(), LLSD(), boost::bind(&LLPanelPreferenceControls::onRestoreDefaultsResponse, this, _1, _2));
-}
-
-void LLPanelPreferenceControls::onRestoreDefaultsResponse(const LLSD& notification, const LLSD& response)
-{
-    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-    switch(option)
-    {
-    case 0: // All
-        for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i)
-        {
-            mConflictHandler[i].resetToDefaults();
-            // Apply changes to viewer as 'temporary'
-            mConflictHandler[i].saveToSettings(true);
-        }
-
-        updateTable();
-        break;
-    case 1: // Current
-        mConflictHandler[mEditingMode].resetToDefaults();
-        // Apply changes to viewer as 'temporary'
-        mConflictHandler[mEditingMode].saveToSettings(true);
-
-        updateTable();
-        break;
-    case 2: // Cancel
-    default:
-        //exit;
-        break;
-    }
-}
-
-// todo: copy onSetKeyBind to interface and inherit from interface
-bool LLPanelPreferenceControls::onSetKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes)
-{
-    if (!mConflictHandler[mEditingMode].canAssignControl(mEditingControl))
-    {
-        return true;
-    }
-
-    if ( mEditingColumn > 0)
-    {
-        if (all_modes)
-        {
-            for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i)
-            {
-                if (mConflictHandler[i].empty())
-                {
-                    mConflictHandler[i].loadFromSettings((LLKeyConflictHandler::ESourceMode)i);
-                }
-                mConflictHandler[i].registerControl(mEditingControl, mEditingColumn - 1, click, key, mask, true);
-                // Apply changes to viewer as 'temporary'
-                mConflictHandler[i].saveToSettings(true);
-            }
-        }
-        else
-        {
-            mConflictHandler[mEditingMode].registerControl(mEditingControl, mEditingColumn - 1, click, key, mask, true);
-            // Apply changes to viewer as 'temporary'
-            mConflictHandler[mEditingMode].saveToSettings(true);
-        }
-    }
-
-    updateTable();
-    return true;
-}
-
-void LLPanelPreferenceControls::onDefaultKeyBind(bool all_modes)
-{
-    if (!mConflictHandler[mEditingMode].canAssignControl(mEditingControl))
-    {
-        return;
-    }
-    
-    if (mEditingColumn > 0)
-    {
-        if (all_modes)
-        {
-            for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i)
-            {
-                if (mConflictHandler[i].empty())
-                {
-                    mConflictHandler[i].loadFromSettings((LLKeyConflictHandler::ESourceMode)i);
-                }
-                mConflictHandler[i].resetToDefault(mEditingControl, mEditingColumn - 1);
-                // Apply changes to viewer as 'temporary'
-                mConflictHandler[i].saveToSettings(true);
-            }
-        }
-        else
-        {
-            mConflictHandler[mEditingMode].resetToDefault(mEditingControl, mEditingColumn - 1);
-            // Apply changes to viewer as 'temporary'
-            mConflictHandler[mEditingMode].saveToSettings(true);
-        }
-    }
-    updateTable();
-}
-
-void LLPanelPreferenceControls::onCancelKeyBind()
-{
-    pControlsTable->deselectAllItems();
-}
-
 LLFloaterPreferenceGraphicsAdvanced::LLFloaterPreferenceGraphicsAdvanced(const LLSD& key)
 	: LLFloater(key)
 {
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 6c2e655270..526214a617 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -37,17 +37,13 @@
 #include "llavatarpropertiesprocessor.h"
 #include "llconversationlog.h"
 #include "llsearcheditor.h"
-#include "llsetkeybinddialog.h"
-#include "llkeyconflict.h"
 
 class LLConversationLogObserver;
 class LLPanelPreference;
 class LLPanelLCD;
 class LLPanelDebug;
 class LLMessageSystem;
-class LLComboBox;
 class LLScrollListCtrl;
-class LLScrollListCell;
 class LLSliderCtrl;
 class LLSD;
 class LLTextBox;
@@ -131,6 +127,13 @@ protected:
 	// callback for when client turns on impostors
 	void onAvatarImpostorsEnable();
 
+	// callback for commit in the "Single click on land" and "Double click on land" comboboxes.
+	void onClickActionChange();
+	// updates click/double-click action settings depending on controls values
+	void updateClickActionSettings();
+	// updates click/double-click action controls depending on values from settings.xml
+	void updateClickActionControls();
+
 public:
 	// This function squirrels away the current values of the controls so that
 	// cancel() can restore them.	
@@ -143,6 +146,10 @@ public:
 	void onClickResetCache();
 	void onClickSkin(LLUICtrl* ctrl,const LLSD& userdata);
 	void onSelectSkin();
+	void onClickSetKey();
+	void setKey(KEY key);
+	void setMouse(LLMouseHandler::EClickType click);
+	void onClickSetMiddleMouse();
 	void onClickSetSounds();
 	void onClickEnablePopup();
 	void onClickDisablePopup();	
@@ -197,6 +204,7 @@ private:
 
 	static std::string sSkin;
 	notifications_map mNotificationOptions;
+	bool mClickActionDirty; ///< Set to true when the click/double-click options get changed by user.
 	bool mGotPersonalInfo;
 	bool mOriginalIMViaEmail;
 	bool mLanguageChanged;
@@ -286,44 +294,6 @@ private:
 	LOG_CLASS(LLPanelPreferenceGraphics);
 };
 
-class LLPanelPreferenceControls : public LLPanelPreference, public LLKeyBindResponderInterface
-{
-	LOG_CLASS(LLPanelPreferenceControls);
-public:
-	LLPanelPreferenceControls();
-	virtual ~LLPanelPreferenceControls();
-
-	BOOL postBuild();
-
-	void apply();
-	void cancel();
-	void saveSettings();
-	void resetDirtyChilds();
-
-	void onListCommit();
-	void onModeCommit();
-	void onRestoreDefaultsBtn();
-	void onRestoreDefaultsResponse(const LLSD& notification, const LLSD& response);
-	/*virtual*/ bool onSetKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes);
-    /*virtual*/ void onDefaultKeyBind(bool all_modes);
-	/*virtual*/ void onCancelKeyBind();
-
-private:
-	// reloads settings, discards current changes, updates table
-	void regenerateControls();
-
-	void populateControlTable();
-	void addSeparator();
-	void updateTable();
-
-	LLScrollListCtrl* pControlsTable;
-	LLComboBox *pKeyModeBox;
-	LLKeyConflictHandler mConflictHandler[LLKeyConflictHandler::MODE_COUNT];
-	std::string mEditingControl;
-	S32 mEditingColumn;
-	S32 mEditingMode;
-};
-
 class LLFloaterPreferenceGraphicsAdvanced : public LLFloater
 {
   public: 
diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp
deleted file mode 100644
index a94836c59d..0000000000
--- a/indra/newview/llkeyconflict.cpp
+++ /dev/null
@@ -1,852 +0,0 @@
-/** 
- * @file llkeyconflict.cpp
- * @brief 
- *
- * $LicenseInfo:firstyear=2019&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2019, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-/*
- * App-wide preferences.  Note that these are not per-user,
- * because we need to load many preferences before we have
- * a login name.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llkeyconflict.h"
-
-#include "llinitparam.h"
-#include "llkeyboard.h"
-#include "lltrans.h"
-#include "llviewercontrol.h"
-#include "llviewerinput.h"
-#include "llviewermenu.h"
-#include "llxuiparser.h"
-
-static const std::string saved_settings_key_controls[] = { "placeholder" }; // add settings from gSavedSettings here
-
-static const std::string filename_default = "key_bindings.xml";
-static const std::string filename_temporary = "key_bindings_tmp.xml"; // used to apply uncommited changes on the go.
-
-// LLKeyboard::stringFromMask is meant for UI and is OS dependent,
-// so this class uses it's own version
-std::string string_from_mask(MASK mask)
-{
-    std::string res;
-    if ((mask & MASK_CONTROL) != 0)
-    {
-        res = "CTL";
-    }
-    if ((mask & MASK_ALT) != 0)
-    {
-        if (!res.empty()) res += "_";
-        res += "ALT";
-    }
-    if ((mask & MASK_SHIFT) != 0)
-    {
-        if (!res.empty()) res += "_";
-        res += "SHIFT";
-    }
-
-    if (mask == MASK_NONE)
-    {
-        res = "NONE";
-    }
-    return res;
-}
-
-std::string string_from_mouse(EMouseClickType click, bool translate)
-{
-    std::string res;
-    switch (click)
-    {
-    case CLICK_LEFT:
-        res = "LMB";
-        break;
-    case CLICK_MIDDLE:
-        res = "MMB";
-        break;
-    case CLICK_RIGHT:
-        res = "RMB";
-        break;
-    case CLICK_BUTTON4:
-        res = "MB4";
-        break;
-    case CLICK_BUTTON5:
-        res = "MB5";
-        break;
-    case CLICK_DOUBLELEFT:
-        res = "Double LMB";
-        break;
-    default:
-        break;
-    }
-
-    if (translate && !res.empty())
-    {
-        res = LLTrans::getString(res);
-    }
-    return res;
-}
-
-// LLKeyConflictHandler
-
-S32 LLKeyConflictHandler::sTemporaryFileUseCount = 0;
-
-LLKeyConflictHandler::LLKeyConflictHandler()
-:   mHasUnsavedChanges(false),
-    mUsesTemporaryFile(false),
-    mLoadMode(MODE_COUNT)
-{
-}
-
-LLKeyConflictHandler::LLKeyConflictHandler(ESourceMode mode)
-:   mHasUnsavedChanges(false),
-    mUsesTemporaryFile(false),
-    mLoadMode(mode)
-{
-    loadFromSettings(mode);
-}
-
-LLKeyConflictHandler::~LLKeyConflictHandler()
-{
-    clearUnsavedChanges();
-    // Note: does not reset bindings if temporary file was used
-}
-
-bool LLKeyConflictHandler::canHandleControl(const std::string &control_name, EMouseClickType mouse_ind, KEY key, MASK mask)
-{
-    return mControlsMap[control_name].canHandle(mouse_ind, key, mask);
-}
-
-bool LLKeyConflictHandler::canHandleKey(const std::string &control_name, KEY key, MASK mask)
-{
-    return canHandleControl(control_name, CLICK_NONE, key, mask);
-}
-
-bool LLKeyConflictHandler::canHandleMouse(const std::string &control_name, EMouseClickType mouse_ind, MASK mask)
-{
-    return canHandleControl(control_name, mouse_ind, KEY_NONE, mask);
-}
-
-bool LLKeyConflictHandler::canHandleMouse(const std::string &control_name, S32 mouse_ind, MASK mask)
-{
-    return canHandleControl(control_name, (EMouseClickType)mouse_ind, KEY_NONE, mask);
-}
-
-bool LLKeyConflictHandler::canAssignControl(const std::string &control_name)
-{
-    control_map_t::iterator iter = mControlsMap.find(control_name);
-    if (iter != mControlsMap.end())
-    {
-        return iter->second.mAssignable;
-    }
-    // If we don't know this control means it wasn't assigned by user yet and thus is editable
-    return true;
-}
-
-// static
-bool LLKeyConflictHandler::isReservedByMenu(const KEY &key, const MASK &mask)
-{
-    if (key == KEY_NONE)
-    {
-        return false;
-    }
-    return (gMenuBarView && gMenuBarView->hasAccelerator(key, mask))
-           || (gLoginMenuBarView && gLoginMenuBarView->hasAccelerator(key, mask));
-}
-
-// static
-bool LLKeyConflictHandler::isReservedByMenu(const LLKeyData &data)
-{
-    if (data.mMouse != CLICK_NONE || data.mKey == KEY_NONE)
-    {
-        return false;
-    }
-    return (gMenuBarView && gMenuBarView->hasAccelerator(data.mKey, data.mMask))
-           || (gLoginMenuBarView && gLoginMenuBarView->hasAccelerator(data.mKey, data.mMask));
-}
-
-bool LLKeyConflictHandler::registerControl(const std::string &control_name, U32 index, EMouseClickType mouse, KEY key, MASK mask, bool ignore_mask)
-{
-    if (control_name.empty())
-    {
-        return false;
-    }
-    LLKeyConflict &type_data = mControlsMap[control_name];
-    if (!type_data.mAssignable)
-    {
-        LL_ERRS() << "Error in code, user or system should not be able to change certain controls" << LL_ENDL;
-    }
-    LLKeyData data(mouse, key, mask, ignore_mask);
-    if (type_data.mKeyBind.getKeyData(index) == data)
-    {
-        return true;
-    }
-    if (isReservedByMenu(data))
-    {
-        return false;
-    }
-    if (removeConflicts(data, type_data.mConflictMask))
-    {
-        type_data.mKeyBind.replaceKeyData(data, index);
-        mHasUnsavedChanges = true;
-        return true;
-    }
-    // control already in use/blocked
-    return false;
-}
-
-LLKeyData LLKeyConflictHandler::getControl(const std::string &control_name, U32 index)
-{
-    if (control_name.empty())
-    {
-        return LLKeyData();
-    }
-    return mControlsMap[control_name].getKeyData(index);
-}
-
-// static
-std::string LLKeyConflictHandler::getStringFromKeyData(const LLKeyData& keydata)
-{
-    std::string result;
-
-    if (keydata.mMask != MASK_NONE && keydata.mKey != KEY_NONE)
-    {
-        result = LLKeyboard::stringFromAccelerator(keydata.mMask, keydata.mKey);
-    }
-    else if (keydata.mKey != KEY_NONE)
-    {
-        result = LLKeyboard::stringFromKey(keydata.mKey);
-    }
-    else if (keydata.mMask != MASK_NONE)
-    {
-        result = LLKeyboard::stringFromAccelerator(keydata.mMask);
-    }
-
-    result += string_from_mouse(keydata.mMouse, true);
-
-    return result;
-}
-
-std::string LLKeyConflictHandler::getControlString(const std::string &control_name, U32 index)
-{
-    if (control_name.empty())
-    {
-        return "";
-    }
-    return getStringFromKeyData(mControlsMap[control_name].getKeyData(index));
-}
-
-void LLKeyConflictHandler::loadFromControlSettings(const std::string &name)
-{
-    LLControlVariablePtr var = gSavedSettings.getControl(name);
-    if (var)
-    {
-        LLKeyBind bind(var->getValue());
-        LLKeyConflict key(bind, true, 0);
-        mControlsMap[name] = key;
-    }
-}
-
-void LLKeyConflictHandler::loadFromSettings(const LLViewerInput::KeyMode& keymode, control_map_t *destination)
-{
-    for (LLInitParam::ParamIterator<LLViewerInput::KeyBinding>::const_iterator it = keymode.bindings.begin(),
-        end_it = keymode.bindings.end();
-        it != end_it;
-    ++it)
-    {
-        KEY key;
-        MASK mask;
-        EMouseClickType mouse = CLICK_NONE;
-        if (it->mouse.isProvided())
-        {
-            LLViewerInput::mouseFromString(it->mouse.getValue(), &mouse);
-        }
-        if (it->key.getValue().empty())
-        {
-            key = KEY_NONE;
-        }
-        else
-        {
-            LLKeyboard::keyFromString(it->key, &key);
-        }
-        LLKeyboard::maskFromString(it->mask, &mask);
-        // Note: it->command is also the name of UI element, howhever xml we are loading from
-        // might not know all the commands, so UI will have to know what to fill by its own
-        LLKeyConflict &type_data = (*destination)[it->command];
-        type_data.mAssignable = true;
-        type_data.mKeyBind.addKeyData(mouse, key, mask, true);
-    }
-}
-
-bool LLKeyConflictHandler::loadFromSettings(const ESourceMode &load_mode, const std::string &filename, control_map_t *destination)
-{
-    if (filename.empty())
-    {
-        return false;
-    }
-
-    bool res = false;
-
-    LLViewerInput::Keys keys;
-    LLSimpleXUIParser parser;
-
-    if (parser.readXUI(filename, keys)
-        && keys.validateBlock())
-    {
-        switch (load_mode)
-        {
-        case MODE_FIRST_PERSON:
-            if (keys.first_person.isProvided())
-            {
-                loadFromSettings(keys.first_person, destination);
-                res = true;
-            }
-            break;
-        case MODE_THIRD_PERSON:
-            if (keys.third_person.isProvided())
-            {
-                loadFromSettings(keys.third_person, destination);
-                res = true;
-            }
-            break;
-        case MODE_EDIT_AVATAR:
-            if (keys.edit_avatar.isProvided())
-            {
-                loadFromSettings(keys.edit_avatar, destination);
-                res = true;
-            }
-            break;
-        case MODE_SITTING:
-            if (keys.sitting.isProvided())
-            {
-                loadFromSettings(keys.sitting, destination);
-                res = true;
-            }
-            break;
-        default:
-            LL_ERRS() << "Not implememted mode " << load_mode << LL_ENDL;
-            break;
-        }
-    }
-    return res;
-}
-
-void LLKeyConflictHandler::loadFromSettings(ESourceMode load_mode)
-{
-    mControlsMap.clear();
-    mDefaultsMap.clear();
-
-    // E.X. In case we need placeholder keys for conflict resolution.
-    generatePlaceholders(load_mode);
-
-    if (load_mode == MODE_SAVED_SETTINGS)
-    {
-        // load settings clss knows about, but it also possible to load settings by name separately
-        const S32 size = std::extent<decltype(saved_settings_key_controls)>::value;
-        for (U32 i = 0; i < size; i++)
-        {
-            loadFromControlSettings(saved_settings_key_controls[i]);
-        }
-    }
-    else
-    {
-        // load defaults
-        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, filename_default);
-        if (!loadFromSettings(load_mode, filename, &mDefaultsMap))
-        {
-            LL_WARNS() << "Failed to load default settings, aborting" << LL_ENDL;
-            return;
-        }
-
-        // load user's
-        filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename_default);
-        if (!gDirUtilp->fileExists(filename) || !loadFromSettings(load_mode, filename, &mControlsMap))
-        {
-            // mind placeholders
-            mControlsMap.insert(mDefaultsMap.begin(), mDefaultsMap.end());
-        }
-    }
-    mLoadMode = load_mode;
-}
-
-void LLKeyConflictHandler::saveToSettings(bool temporary)
-{
-    if (mControlsMap.empty())
-    {
-        return;
-    }
-
-    if (mLoadMode == MODE_SAVED_SETTINGS)
-    {
-        // Does not support 'temporary', preferences handle that themself
-        // so in case of saved settings we just do not clear mHasUnsavedChanges
-        control_map_t::iterator iter = mControlsMap.begin();
-        control_map_t::iterator end = mControlsMap.end();
-
-        for (; iter != end; ++iter)
-        {
-            if (iter->first.empty())
-            {
-                continue;
-            }
-
-            LLKeyConflict &key = iter->second;
-            key.mKeyBind.trimEmpty();
-            if (!key.mAssignable)
-            {
-                continue;
-            }
-
-            if (gSavedSettings.controlExists(iter->first))
-            {
-                gSavedSettings.setLLSD(iter->first, key.mKeyBind.asLLSD());
-            }
-            else if (!key.mKeyBind.empty())
-            {
-                // Note: this is currently not in use, might be better for load mechanics to ask for and retain control group
-                // otherwise settings loaded from other control groups will end in this one
-                LL_INFOS() << "Creating new keybinding " << iter->first << LL_ENDL;
-                gSavedSettings.declareLLSD(iter->first, key.mKeyBind.asLLSD(), "comment", LLControlVariable::PERSIST_ALWAYS);
-            }
-        }
-    }
-    else
-    {
-        // Determine what file to load and load full copy of that file
-        std::string filename;
-
-        if (temporary)
-        {
-            filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename_temporary);
-            if (!gDirUtilp->fileExists(filename))
-            {
-                filename.clear();
-            }
-        }
-
-        if (filename.empty())
-        {
-            filename = gDirUtilp->findFile(filename_default,
-                gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, ""),
-                gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
-        }
-
-        LLViewerInput::Keys keys;
-        LLSimpleXUIParser parser;
-
-        if (parser.readXUI(filename, keys)
-            && keys.validateBlock())
-        {
-            // replace category we edited
-
-            // mode is a HACK to correctly reset bindings without reparsing whole file and avoid doing
-            // own param container (which will face issues with inasseesible members of LLInitParam)
-            LLViewerInput::KeyMode mode;
-            LLViewerInput::KeyBinding binding;
-
-            control_map_t::iterator iter = mControlsMap.begin();
-            control_map_t::iterator end = mControlsMap.end();
-            for (; iter != end; ++iter)
-            {
-                // By default xml have (had) up to 6 elements per function
-                // eventually it will be cleaned up and UI will only shows 3 per function,
-                // so make sure to cleanup.
-                // Also this helps in keeping file small.
-                iter->second.mKeyBind.trimEmpty();
-                U32 size = iter->second.mKeyBind.getDataCount();
-                for (U32 i = 0; i < size; ++i)
-                {
-                    if (iter->first.empty())
-                    {
-                        continue;
-                    }
-
-                    LLKeyConflict &key = iter->second;
-                    key.mKeyBind.trimEmpty();
-                    if (key.mKeyBind.empty() || !key.mAssignable)
-                    {
-                        continue;
-                    }
-
-                    LLKeyData data = key.mKeyBind.getKeyData(i);
-                    // Still write empty LLKeyData to make sure we will maintain UI position
-                    if (data.mKey == KEY_NONE)
-                    {
-                        // Might be better idea to be consistent and use NONE. LLViewerInput can work with both cases
-                        binding.key = "";
-                    }
-                    else
-                    {
-                        binding.key = LLKeyboard::stringFromKey(data.mKey, false /*Do not localize*/);
-                    }
-                    binding.mask = string_from_mask(data.mMask);
-                    if (data.mMouse == CLICK_NONE)
-                    {
-                        binding.mouse.setProvided(false);
-                    }
-                    else
-                    {
-                        // set() because 'optional', for compatibility purposes
-                        // just copy old keys.xml and rename to key_bindings.xml, it should work
-                        binding.mouse.set(string_from_mouse(data.mMouse, false), true);
-                    }
-                    binding.command = iter->first;
-                    mode.bindings.add(binding);
-                }
-            }
-
-            switch (mLoadMode)
-            {
-            case MODE_FIRST_PERSON:
-                if (keys.first_person.isProvided())
-                {
-                    keys.first_person.bindings.set(mode.bindings, true);
-                }
-                break;
-            case MODE_THIRD_PERSON:
-                if (keys.third_person.isProvided())
-                {
-                    keys.third_person.bindings.set(mode.bindings, true);
-                }
-                break;
-            case MODE_EDIT_AVATAR:
-                if (keys.edit_avatar.isProvided())
-                {
-                    keys.edit_avatar.bindings.set(mode.bindings, true);
-                }
-                break;
-            case MODE_SITTING:
-                if (keys.sitting.isProvided())
-                {
-                    keys.sitting.bindings.set(mode.bindings, true);
-                }
-                break;
-            default:
-                LL_ERRS() << "Not implememted mode " << mLoadMode << LL_ENDL;
-                break;
-            }
-
-            if (temporary)
-            {
-                // write to temporary xml and use it for gViewerInput
-                filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename_temporary);
-                if (!mUsesTemporaryFile)
-                {
-                    mUsesTemporaryFile = true;
-                    sTemporaryFileUseCount++;
-                }
-            }
-            else
-            {
-                // write back to user's xml and use it for gViewerInput
-                filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename_default);
-                // Don't reset mUsesTemporaryFile, it will be reset at cleanup stage
-            }
-
-            LLXMLNodePtr output_node = new LLXMLNode("keys", false);
-            LLXUIParser parser;
-            parser.writeXUI(output_node, keys);
-
-            // Write the resulting XML to file
-            if (!output_node->isNull())
-            {
-                LLFILE *fp = LLFile::fopen(filename, "w");
-                if (fp != NULL)
-                {
-                    LLXMLNode::writeHeaderToFile(fp);
-                    output_node->writeToFile(fp);
-                    fclose(fp);
-                }
-            }
-            // Now force a rebind for keyboard
-            if (gDirUtilp->fileExists(filename))
-            {
-                // Ideally instead of rebinding immediately we should shedule
-                // the rebind since single file can have multiple handlers,
-                // one per mode, saving simultaneously.
-                // Or whatever uses LLKeyConflictHandler should control the process.
-                gViewerInput.loadBindingsXML(filename);
-            }
-        }
-    }
-
-    if (!temporary)
-    {
-        // will remove any temporary file if there were any
-        clearUnsavedChanges();
-    }
-}
-
-LLKeyData LLKeyConflictHandler::getDefaultControl(const std::string &control_name, U32 index)
-{
-    if (control_name.empty())
-    {
-        return LLKeyData();
-    }
-    if (mLoadMode == MODE_SAVED_SETTINGS)
-    {
-        LLControlVariablePtr var = gSavedSettings.getControl(control_name);
-        if (var)
-        {
-            return LLKeyBind(var->getDefault()).getKeyData(index);
-        }
-        return LLKeyData();
-    }
-    else
-    {
-        control_map_t::iterator iter = mDefaultsMap.find(control_name);
-        if (iter != mDefaultsMap.end())
-        {
-            return iter->second.mKeyBind.getKeyData(index);
-        }
-        return LLKeyData();
-    }
-}
-
-void LLKeyConflictHandler::resetToDefault(const std::string &control_name, U32 index)
-{
-    if (control_name.empty())
-    {
-        return;
-    }
-    LLKeyData data = getDefaultControl(control_name, index);
-
-    if (data != mControlsMap[control_name].getKeyData(index))
-    {
-        // reset controls that might have been switched to our current control
-        removeConflicts(data, mControlsMap[control_name].mConflictMask);
-        mControlsMap[control_name].setKeyData(data, index);
-    }
-}
-
-void LLKeyConflictHandler::resetToDefaultAndResolve(const std::string &control_name, bool ignore_conflicts)
-{
-    if (control_name.empty())
-    {
-        return;
-    }
-    if (mLoadMode == MODE_SAVED_SETTINGS)
-    {
-        LLControlVariablePtr var = gSavedSettings.getControl(control_name);
-        if (var)
-        {
-            LLKeyBind bind(var->getDefault());
-            if (!ignore_conflicts)
-            {
-                for (S32 i = 0; i < bind.getDataCount(); ++i)
-                {
-                    removeConflicts(bind.getKeyData(i), mControlsMap[control_name].mConflictMask);
-                }
-            }
-            mControlsMap[control_name].mKeyBind = bind;
-        }
-        else
-        {
-            mControlsMap[control_name].mKeyBind.clear();
-        }
-    }
-    else
-    {
-        control_map_t::iterator iter = mDefaultsMap.find(control_name);
-        if (iter != mDefaultsMap.end())
-        {
-            if (!ignore_conflicts)
-            {
-                for (S32 i = 0; i < iter->second.mKeyBind.getDataCount(); ++i)
-                {
-                    removeConflicts(iter->second.mKeyBind.getKeyData(i), mControlsMap[control_name].mConflictMask);
-                }
-            }
-            mControlsMap[control_name].mKeyBind = iter->second.mKeyBind;
-        }
-        else
-        {
-            mControlsMap[control_name].mKeyBind.clear();
-        }
-    }
-}
-
-void LLKeyConflictHandler::resetToDefault(const std::string &control_name)
-{
-    // reset specific binding without ignoring conflicts
-    resetToDefaultAndResolve(control_name, false);
-}
-
-void LLKeyConflictHandler::resetToDefaults(ESourceMode mode)
-{
-    if (mode == MODE_SAVED_SETTINGS)
-    {
-        control_map_t::iterator iter = mControlsMap.begin();
-        control_map_t::iterator end = mControlsMap.end();
-
-        for (; iter != end; ++iter)
-        {
-            resetToDefaultAndResolve(iter->first, true);
-        }
-    }
-    else
-    {
-        mControlsMap.clear();
-        generatePlaceholders(mode);
-        mControlsMap.insert(mDefaultsMap.begin(), mDefaultsMap.end());
-    }
-
-    mHasUnsavedChanges = true;
-}
-
-void LLKeyConflictHandler::resetToDefaults()
-{
-    if (!empty())
-    {
-        resetToDefaults(mLoadMode);
-    }
-    else
-    {
-        // not optimal since:
-        // 1. We are not sure that mLoadMode was set
-        // 2. We are not sure if there are any changes in comparison to default
-        // 3. We are loading 'current' only to replace it
-        // but it is reliable and works Todo: consider optimizing.
-        loadFromSettings(mLoadMode);
-        resetToDefaults(mLoadMode);
-    }
-}
-
-void LLKeyConflictHandler::clear()
-{
-    if (clearUnsavedChanges())
-    {
-        // temporary file was removed, this means we were using it and need to reload keyboard's bindings
-        resetKeyboardBindings();
-    }
-    mControlsMap.clear();
-    mDefaultsMap.clear();
-}
-
-// static
-void LLKeyConflictHandler::resetKeyboardBindings()
-{
-    // Try to load User's bindings first
-    std::string key_bindings_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename_default);
-    if (!gDirUtilp->fileExists(key_bindings_file) || !gViewerInput.loadBindingsXML(key_bindings_file))
-    {
-        // Failed to load custom bindings, try default ones
-        key_bindings_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, filename_default);
-        if (!gViewerInput.loadBindingsXML(key_bindings_file))
-        {
-            LL_ERRS("InitInfo") << "Unable to open default key bindings from " << key_bindings_file << LL_ENDL;
-        }
-    }
-}
-
-void LLKeyConflictHandler::generatePlaceholders(ESourceMode load_mode)
-{
-    // These controls are meant to cause conflicts when user tries to assign same control somewhere else
-    // also this can be used to pre-record controls that should not conflict or to assign conflict groups/masks
-    /*registerTemporaryControl(CONTROL_RESERVED_MENU, CLICK_RIGHT, KEY_NONE, MASK_NONE, 0);
-    registerTemporaryControl(CONTROL_DELETE, CLICK_NONE, KEY_DELETE, MASK_NONE, 0);*/
-}
-
-bool LLKeyConflictHandler::removeConflicts(const LLKeyData &data, const U32 &conlict_mask)
-{
-    if (conlict_mask == CONFLICT_NOTHING)
-    {
-        // Can't conflict
-        return true;
-    }
-    std::map<std::string, S32> conflict_list;
-    control_map_t::iterator cntrl_iter = mControlsMap.begin();
-    control_map_t::iterator cntrl_end = mControlsMap.end();
-    for (; cntrl_iter != cntrl_end; ++cntrl_iter)
-    {
-        S32 index = cntrl_iter->second.mKeyBind.findKeyData(data);
-        if (index >= 0
-            && cntrl_iter->second.mConflictMask != CONFLICT_NOTHING
-            && (cntrl_iter->second.mConflictMask & conlict_mask) != 0)
-        {
-            if (cntrl_iter->second.mAssignable)
-            {
-                // Potentially we can have multiple conflict flags conflicting
-                // including unassignable keys.
-                // So record the conflict and find all others before doing any changes.
-                // Assume that there is only one conflict per bind
-                conflict_list[cntrl_iter->first] = index;
-            }
-            else
-            {
-                return false;
-            }
-        }
-    }
-
-    std::map<std::string, S32>::iterator cnflct_iter = conflict_list.begin();
-    std::map<std::string, S32>::iterator cnflct_end = conflict_list.end();
-    for (; cnflct_iter != cnflct_end; ++cnflct_iter)
-    {
-        mControlsMap[cnflct_iter->first].mKeyBind.resetKeyData(cnflct_iter->second);
-    }
-    return true;
-}
-
-void LLKeyConflictHandler::registerTemporaryControl(const std::string &control_name, EMouseClickType mouse, KEY key, MASK mask, U32 conflict_mask)
-{
-    LLKeyConflict *type_data = &mControlsMap[control_name];
-    type_data->mAssignable = false;
-    type_data->mConflictMask = conflict_mask;
-    type_data->mKeyBind.addKeyData(mouse, key, mask, false);
-}
-
-bool LLKeyConflictHandler::clearUnsavedChanges()
-{
-    bool result = false;
-    mHasUnsavedChanges = false;
-
-    if (mUsesTemporaryFile)
-    {
-        mUsesTemporaryFile = false;
-        sTemporaryFileUseCount--;
-        if (!sTemporaryFileUseCount)
-        {
-            result = clearTemporaryFile();
-        }
-        // else: might be usefull to overwrite content of temp file with defaults
-        // but at the moment there is no such need
-    }
-    return result;
-}
-
-//static
-bool LLKeyConflictHandler::clearTemporaryFile()
-{
-    // At the moment single file needs five handlers (one per mode), so doing this
-    // will remove file for all hadlers
-    std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename_temporary);
-    if (gDirUtilp->fileExists(filename))
-    {
-        LLFile::remove(filename);
-        return true;
-    }
-    return false;
-}
-
diff --git a/indra/newview/llkeyconflict.h b/indra/newview/llkeyconflict.h
deleted file mode 100644
index 84730e4d4f..0000000000
--- a/indra/newview/llkeyconflict.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/** 
- * @file llkeyconflict.h
- * @brief 
- *
- * $LicenseInfo:firstyear=2019&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2019, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLKEYCONFLICT_H
-#define LL_LLKEYCONFLICT_H
-
-#include "llkeybind.h"
-#include "llviewerinput.h"
-
-
-class LLKeyConflict
-{
-public:
-    LLKeyConflict() : mAssignable(true), mConflictMask(U32_MAX) {} //temporary assignable, don't forget to change once all keys are recorded
-    LLKeyConflict(bool assignable, U32 conflict_mask)
-        : mAssignable(assignable), mConflictMask(conflict_mask) {}
-    LLKeyConflict(const LLKeyBind &bind, bool assignable, U32 conflict_mask)
-        : mAssignable(assignable), mConflictMask(conflict_mask), mKeyBind(bind) {}
-
-    LLKeyData getPrimaryKeyData() { return mKeyBind.getKeyData(0); }
-    LLKeyData getKeyData(U32 index) { return mKeyBind.getKeyData(index); }
-    void setPrimaryKeyData(const LLKeyData& data) { mKeyBind.replaceKeyData(data, 0); }
-    void setKeyData(const LLKeyData& data, U32 index) { mKeyBind.replaceKeyData(data, index); }
-    bool canHandle(EMouseClickType mouse, KEY key, MASK mask) { return mKeyBind.canHandle(mouse, key, mask); }
-
-    LLKeyBind mKeyBind;
-    bool mAssignable; // whether user can change key or key simply acts as placeholder
-    U32 mConflictMask;
-};
-
-class LLKeyConflictHandler
-{
-public:
-
-    enum ESourceMode // partially repeats e_keyboard_mode
-    {
-        MODE_FIRST_PERSON,
-        MODE_THIRD_PERSON,
-        MODE_EDIT_AVATAR,
-        MODE_SITTING,
-        MODE_SAVED_SETTINGS, // for settings from saved settings
-        MODE_COUNT
-    };
-
-    const U32 CONFLICT_NOTHING = 0;
-    // at the moment this just means that key will conflict with everything that is identical
-    const U32 CONFLICT_ANY = U32_MAX;
-
-    // Note: missed selection and edition commands (would be really nice to go through selection via MB4/5 or wheel)
-
-    LLKeyConflictHandler();
-    LLKeyConflictHandler(ESourceMode mode);
-    ~LLKeyConflictHandler();
-
-    bool canHandleControl(const std::string &control_name, EMouseClickType mouse_ind, KEY key, MASK mask);
-    bool canHandleKey(const std::string &control_name, KEY key, MASK mask);
-    bool canHandleMouse(const std::string &control_name, EMouseClickType mouse_ind, MASK mask);
-    bool canHandleMouse(const std::string &control_name, S32 mouse_ind, MASK mask); //Just for convinience
-    bool canAssignControl(const std::string &control_name);
-    static bool isReservedByMenu(const KEY &key, const MASK &mask);
-    static bool isReservedByMenu(const LLKeyData &data);
-    bool registerControl(const std::string &control_name, U32 data_index, EMouseClickType mouse_ind, KEY key, MASK mask, bool ignore_mask); //todo: return conflicts?
-
-    LLKeyData getControl(const std::string &control_name, U32 data_index);
-
-    // localized string
-    static std::string getStringFromKeyData(const LLKeyData& keydata);
-    std::string getControlString(const std::string &control_name, U32 data_index);
-
-    // Load single control, overrides existing one if names match
-    void loadFromControlSettings(const std::string &name);
-    // Drops any changes loads controls with ones from 'saved settings' or from xml
-    void loadFromSettings(ESourceMode load_mode);
-
-    // Saves settings to 'saved settings' or to xml
-    // If 'temporary' is set, function will save settings to temporary
-    // file and reload input bindings from temporary file.
-    // 'temporary' does not support gSavedSettings, those are handled
-    // by preferences, so 'temporary' is such case will simply not
-    // reset mHasUnsavedChanges
-    void saveToSettings(bool apply_temporary = false);
-
-    LLKeyData getDefaultControl(const std::string &control_name, U32 data_index);
-    // Resets keybinding to default variant from 'saved settings' or xml
-    void resetToDefault(const std::string &control_name, U32 index);
-    void resetToDefault(const std::string &control_name);
-    // resets current mode to defaults
-    void resetToDefaults();
-
-    bool empty() { return mControlsMap.empty(); }
-    void clear();
-
-    // reloads bindings from last valid user's xml or from default xml
-    // to keyboard's handler
-    static void resetKeyboardBindings();
-
-    bool hasUnsavedChanges() { return mHasUnsavedChanges; }
-    void setLoadMode(ESourceMode mode) { mLoadMode = mode; }
-    ESourceMode getLoadMode() { return mLoadMode; }
-
-private:
-    void resetToDefaultAndResolve(const std::string &control_name, bool ignore_conflicts);
-    void resetToDefaults(ESourceMode mode);
-
-    // at the moment these kind of control is not savable, but takes part will take part in conflict resolution
-    void registerTemporaryControl(const std::string &control_name, EMouseClickType mouse_ind, KEY key, MASK mask, U32 conflict_mask);
-
-    typedef std::map<std::string, LLKeyConflict> control_map_t;
-    void loadFromSettings(const LLViewerInput::KeyMode& keymode, control_map_t *destination);
-    bool loadFromSettings(const ESourceMode &load_mode, const std::string &filename, control_map_t *destination);
-    void generatePlaceholders(ESourceMode load_mode); //E.x. non-assignable values
-    // returns false in case user is trying to reuse control that can't be reassigned
-    bool removeConflicts(const LLKeyData &data, const U32 &conlict_mask);
-
-    // removes flags and removes temporary file, returns 'true' if file was removed
-    bool clearUnsavedChanges();
-    // return true if there was a file to remove
-    static bool clearTemporaryFile();
-
-    control_map_t mControlsMap;
-    control_map_t mDefaultsMap;
-    bool mHasUnsavedChanges;
-    ESourceMode mLoadMode;
-
-    // To implement 'apply immediately'+revert on cancel, class applies changes to temporary file
-    // but this only works for settings from keybndings files (key_bindings.xml)
-    // saved setting rely onto external mechanism of preferences floater
-    bool mUsesTemporaryFile;
-    static S32 sTemporaryFileUseCount;
-};
-
-
-#endif  // LL_LLKEYCONFLICT_H
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index 197b272c5d..67cd23d2ee 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -832,8 +832,32 @@ void LLPanelPrimMediaControls::draw()
 
 BOOL LLPanelPrimMediaControls::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	mInactivityTimer.start();
-	return LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks);
+    mInactivityTimer.start();
+    BOOL res = FALSE;
+
+    // Unlike other mouse events, we need to handle scroll here otherwise
+    // it will be intercepted by camera and won't reach toolpie
+    if (LLViewerMediaFocus::getInstance()->isHoveringOverFocused())
+    {
+        // either let toolpie handle this or expose mHoverPick.mUVCoords in some way
+        res = LLToolPie::getInstance()->handleScrollWheel(x, y, clicks);
+    }
+
+    return res;
+}
+
+BOOL LLPanelPrimMediaControls::handleScrollHWheel(S32 x, S32 y, S32 clicks)
+{
+    mInactivityTimer.start();
+    BOOL res = FALSE;
+
+    if (LLViewerMediaFocus::getInstance()->isHoveringOverFocused())
+    {
+        // either let toolpie handle this or expose mHoverPick.mUVCoords in some way
+        res = LLToolPie::getInstance()->handleScrollHWheel(x, y, clicks);
+    }
+
+    return res;
 }
 
 BOOL LLPanelPrimMediaControls::handleMouseDown(S32 x, S32 y, MASK mask)
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h
index 6256ce8411..86fc036553 100644
--- a/indra/newview/llpanelprimmediacontrols.h
+++ b/indra/newview/llpanelprimmediacontrols.h
@@ -48,6 +48,7 @@ public:
 	/*virtual*/ BOOL postBuild();
 	virtual void draw();
 	virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
+	virtual BOOL handleScrollHWheel(S32 x, S32 y, S32 clicks);
 
 	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
diff --git a/indra/newview/llsetkeybinddialog.cpp b/indra/newview/llsetkeybinddialog.cpp
deleted file mode 100644
index 4eb76c9d89..0000000000
--- a/indra/newview/llsetkeybinddialog.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-/** 
- * @file llsetkeybinddialog.cpp
- * @brief LLSetKeyBindDialog class implementation.
- *
- * $LicenseInfo:firstyear=2019&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2019, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llsetkeybinddialog.h"
-
-#include "llbutton.h"
-#include "llcheckboxctrl.h"
-#include "lleventtimer.h"
-#include "llfloaterreg.h"
-#include "llfocusmgr.h"
-#include "llkeyconflict.h"
-#include "llviewercontrol.h"
-
-class LLSetKeyBindDialog::Updater : public LLEventTimer
-{
-public:
-
-    typedef boost::function<void(MASK)> callback_t;
-
-    Updater(callback_t cb, F32 period, MASK mask)
-        :LLEventTimer(period),
-        mMask(mask),
-        mCallback(cb)
-    {
-        mEventTimer.start();
-    }
-
-    virtual ~Updater(){}
-
-protected:
-    BOOL tick()
-    {
-        mCallback(mMask);
-        // Deletes itseft after execution
-        return TRUE;
-    }
-
-private:
-    MASK mMask;
-    callback_t mCallback;
-};
-
-bool LLSetKeyBindDialog::sRecordKeys = false;
-
-LLSetKeyBindDialog::LLSetKeyBindDialog(const LLSD& key)
-    : LLModalDialog(key),
-    pParent(NULL),
-    mKeyFilterMask(DEFAULT_KEY_FILTER),
-    pUpdater(NULL),
-    mContextConeOpacity(0.f),
-    mContextConeInAlpha(0.f),
-    mContextConeOutAlpha(0.f),
-    mContextConeFadeTime(0.f)
-{
-	mContextConeInAlpha = gSavedSettings.getF32("ContextConeInAlpha");
-	mContextConeOutAlpha = gSavedSettings.getF32("ContextConeOutAlpha");
-	mContextConeFadeTime = gSavedSettings.getF32("ContextConeFadeTime");
-}
-
-LLSetKeyBindDialog::~LLSetKeyBindDialog()
-{
-}
-
-//virtual
-BOOL LLSetKeyBindDialog::postBuild()
-{
-    childSetAction("SetEmpty", onBlank, this);
-    childSetAction("Default", onDefault, this);
-    childSetAction("Cancel", onCancel, this);
-    getChild<LLUICtrl>("Cancel")->setFocus(TRUE);
-
-    pCheckBox = getChild<LLCheckBoxCtrl>("apply_all");
-    pDesription = getChild<LLTextBase>("descritption");
-
-    gFocusMgr.setKeystrokesOnly(TRUE);
-
-    return TRUE;
-}
-
-//virtual
-void LLSetKeyBindDialog::onOpen(const LLSD& data)
-{
-     sRecordKeys = true;
-     LLModalDialog::onOpen(data);
-}
-
-//virtual
-void LLSetKeyBindDialog::onClose(bool app_quiting)
-{
-    sRecordKeys = false;
-    if (pParent)
-    {
-        pParent->onCancelKeyBind();
-        pParent = NULL;
-    }
-    if (pUpdater)
-    {
-        // Doubleclick timer has't fired, delete it
-        delete pUpdater;
-        pUpdater = NULL;
-    }
-    LLModalDialog::onClose(app_quiting);
-}
-
-void LLSetKeyBindDialog::drawFrustum()
-{
-    static LLCachedControl<F32> max_opacity(gSavedSettings, "PickerContextOpacity", 0.4f);
-    drawConeToOwner(mContextConeOpacity, max_opacity, mFrustumOrigin.get(), mContextConeFadeTime, mContextConeInAlpha, mContextConeOutAlpha);
-}
-
-//virtual
-void LLSetKeyBindDialog::draw()
-{
-    drawFrustum();
-    LLModalDialog::draw();
-}
-
-void LLSetKeyBindDialog::setParent(LLKeyBindResponderInterface* parent, LLView* frustum_origin, U32 key_mask)
-{
-    pParent = parent;
-    mFrustumOrigin = frustum_origin->getHandle();
-    mKeyFilterMask = key_mask;
-
-    std::string input;
-    if ((key_mask & ALLOW_MOUSE) != 0)
-    {
-        input = getString("mouse");
-    }
-    if ((key_mask & ALLOW_KEYS) != 0)
-    {
-        if (!input.empty())
-        {
-            input += ", ";
-        }
-        input += getString("keyboard");
-    }
-    pDesription->setText(getString("basic_description"));
-    pDesription->setTextArg("[INPUT]", input);
-}
-
-// static
-bool LLSetKeyBindDialog::recordKey(KEY key, MASK mask)
-{
-    if (sRecordKeys)
-    {
-        LLSetKeyBindDialog* dialog = LLFloaterReg::getTypedInstance<LLSetKeyBindDialog>("keybind_dialog", LLSD());
-        if (dialog && dialog->getVisible())
-        {
-            return dialog->recordAndHandleKey(key, mask);
-        }
-        else
-        {
-            LL_WARNS() << "Key recording was set despite no open dialog" << LL_ENDL;
-            sRecordKeys = false;
-        }
-    }
-    return false;
-}
-
-bool LLSetKeyBindDialog::recordAndHandleKey(KEY key, MASK mask)
-{
-    if ((key == 'Q' && mask == MASK_CONTROL)
-        || key == KEY_ESCAPE)
-    {
-        sRecordKeys = false;
-        closeFloater();
-        return true;
-    }
-
-    if (key == KEY_DELETE)
-    {
-        setKeyBind(CLICK_NONE, KEY_NONE, MASK_NONE, false);
-        sRecordKeys = false;
-        closeFloater();
-        return false;
-    }
-
-    // forbidden keys
-    if (key == KEY_NONE
-        || key == KEY_RETURN
-        || key == KEY_BACKSPACE)
-    {
-        return false;
-    }
-
-    if ((mKeyFilterMask & ALLOW_MASKS) == 0
-        && (key == KEY_CONTROL || key == KEY_SHIFT || key == KEY_ALT))
-    {
-        // mask by themself are not allowed
-        return false;
-    }
-    else if ((mKeyFilterMask & ALLOW_KEYS) == 0)
-    {
-        // basic keys not allowed
-        return false;
-    }
-    else if ((mKeyFilterMask & ALLOW_MASK_KEYS) == 0 && mask != 0)
-    {
-        // masked keys not allowed
-        return false;
-    }
-
-    if (LLKeyConflictHandler::isReservedByMenu(key, mask))
-    {
-        pDesription->setText(getString("reserved_by_menu"));
-        pDesription->setTextArg("[KEYSTR]", LLKeyboard::stringFromAccelerator(mask,key));
-        return true;
-    }
-
-    setKeyBind(CLICK_NONE, key, mask, pCheckBox->getValue().asBoolean());
-    sRecordKeys = false;
-    closeFloater();
-    return true;
-}
-
-BOOL LLSetKeyBindDialog::handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down)
-{
-    BOOL result = FALSE;
-    if (!pParent)
-    {
-        // we already processed 'down' event, this is 'up', consume
-        closeFloater();
-        result = TRUE;
-    }
-    if (!result && clicktype == CLICK_LEFT)
-    {
-        // try handling buttons first
-        if (down)
-        {
-            result = LLView::handleMouseDown(x, y, mask);
-        }
-        else
-        {
-            result = LLView::handleMouseUp(x, y, mask);
-        }
-        if (result)
-        {
-            setFocus(TRUE);
-            gFocusMgr.setKeystrokesOnly(TRUE);
-        }
-        // ignore selection related combinations
-        else if (down && (mask & (MASK_SHIFT | MASK_CONTROL)) == 0)
-        {
-            // this can be a double click, wait a bit;
-            if (!pUpdater)
-            {
-                // Note: default doubleclick time is 500ms, but can stretch up to 5s
-                pUpdater = new Updater(boost::bind(&onClickTimeout, this, _1), 0.7f, mask);
-                result = TRUE;
-            }
-        }
-    }
-
-    if (!result
-        && (clicktype != CLICK_LEFT) // subcases were handled above
-        && ((mKeyFilterMask & ALLOW_MOUSE) != 0)
-        && (clicktype != CLICK_RIGHT || mask != 0) // reassigning menu button is not supported
-        && ((mKeyFilterMask & ALLOW_MASK_MOUSE) != 0 || mask == 0)) // reserved for selection
-    {
-        setKeyBind(clicktype, KEY_NONE, mask, pCheckBox->getValue().asBoolean());
-        result = TRUE;
-        if (!down)
-        {
-            // wait for 'up' event before closing
-            // alternative: set pUpdater
-            closeFloater();
-        }
-    }
-
-    return result;
-}
-
-//static
-void LLSetKeyBindDialog::onCancel(void* user_data)
-{
-    LLSetKeyBindDialog* self = (LLSetKeyBindDialog*)user_data;
-    self->closeFloater();
-}
-
-//static
-void LLSetKeyBindDialog::onBlank(void* user_data)
-{
-    LLSetKeyBindDialog* self = (LLSetKeyBindDialog*)user_data;
-    // tmp needs 'no key' button
-    self->setKeyBind(CLICK_NONE, KEY_NONE, MASK_NONE, false);
-    self->closeFloater();
-}
-
-//static
-void LLSetKeyBindDialog::onDefault(void* user_data)
-{
-    LLSetKeyBindDialog* self = (LLSetKeyBindDialog*)user_data;
-    if (self->pParent)
-    {
-        self->pParent->onDefaultKeyBind(self->pCheckBox->getValue().asBoolean());
-        self->pParent = NULL;
-    }
-    self->closeFloater();
-}
-
-//static
-void LLSetKeyBindDialog::onClickTimeout(void* user_data, MASK mask)
-{
-    LLSetKeyBindDialog* self = (LLSetKeyBindDialog*)user_data;
-
-    // timer will delete itself after timeout
-    self->pUpdater = NULL;
-
-    self->setKeyBind(CLICK_LEFT, KEY_NONE, mask, self->pCheckBox->getValue().asBoolean());
-    self->closeFloater();
-}
-
-void LLSetKeyBindDialog::setKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes)
-{
-    if (pParent)
-    {
-        pParent->onSetKeyBind(click, key, mask, all_modes);
-        pParent = NULL;
-    }
-}
-
diff --git a/indra/newview/llsetkeybinddialog.h b/indra/newview/llsetkeybinddialog.h
deleted file mode 100644
index 70190230e4..0000000000
--- a/indra/newview/llsetkeybinddialog.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/** 
- * @file llsetkeybinddialog.h
- * @brief LLSetKeyBindDialog class definition
- *
- * $LicenseInfo:firstyear=2019&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2019, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-
-#ifndef LL_LLSETKEYBINDDIALOG_H
-#define LL_LLSETKEYBINDDIALOG_H
-
-#include "llmodaldialog.h"
-
-class LLCheckBoxCtrl;
-class LLTextBase;
-
-// Filters for LLSetKeyBindDialog
-static const U32 ALLOW_MOUSE = 1;
-static const U32 ALLOW_MASK_MOUSE = 2;
-static const U32 ALLOW_KEYS = 4; //keyboard
-static const U32 ALLOW_MASK_KEYS = 8;
-static const U32 ALLOW_MASKS = 16;
-static const U32 DEFAULT_KEY_FILTER = ALLOW_MOUSE | ALLOW_MASK_MOUSE | ALLOW_KEYS | ALLOW_MASK_KEYS;
-
-
-class LLKeyBindResponderInterface
-{
-public:
-    virtual ~LLKeyBindResponderInterface() {};
-
-    virtual void onCancelKeyBind() = 0;
-    virtual void onDefaultKeyBind(bool all_modes) = 0;
-    // returns true if parent failed to set key due to key being in use
-    virtual bool onSetKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes) = 0;
-};
-
-class LLSetKeyBindDialog : public LLModalDialog
-{
-public:
-    LLSetKeyBindDialog(const LLSD& key);
-    ~LLSetKeyBindDialog();
-
-    /*virtual*/ BOOL postBuild();
-    /*virtual*/ void onOpen(const LLSD& data);
-    /*virtual*/ void onClose(bool app_quiting);
-    /*virtual*/ void draw();
-
-    void setParent(LLKeyBindResponderInterface* parent, LLView* frustum_origin, U32 key_mask = DEFAULT_KEY_FILTER);
-
-    // Wrapper around recordAndHandleKey
-    // It does not record, it handles, but handleKey function is already in use
-    static bool recordKey(KEY key, MASK mask);
-
-    BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down);
-    static void onCancel(void* user_data);
-    static void onBlank(void* user_data);
-    static void onDefault(void* user_data);
-    static void onClickTimeout(void* user_data, MASK mask);
-
-    class Updater;
-
-private:
-    bool recordAndHandleKey(KEY key, MASK mask);
-    void setKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes);
-    LLKeyBindResponderInterface *pParent;
-    LLCheckBoxCtrl *pCheckBox;
-    LLTextBase *pDesription;
-
-    U32 mKeyFilterMask;
-    Updater *pUpdater;
-
-    static bool sRecordKeys; // for convinience and not to check instance each time
-
-    // drawFrustum
-private:
-    void drawFrustum();
-
-    LLHandle <LLView>   mFrustumOrigin;
-    F32                 mContextConeOpacity;
-    F32                 mContextConeInAlpha;
-    F32                 mContextConeOutAlpha;
-    F32                 mContextConeFadeTime;
-};
-
-
-#endif  // LL_LLSETKEYBINDDIALOG_H
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 1430e65569..2cdba4d9ba 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -994,7 +994,7 @@ LLSpatialGroup *LLSpatialPartition::put(LLDrawable *drawablep, BOOL was_visible)
 	}	
 	
 	LLSpatialGroup* group = drawablep->getSpatialGroup();
-	//llassert(group != NULL);
+	llassert(group != NULL);
 
 	if (group && was_visible && group->isOcclusionState(LLSpatialGroup::QUERY_PENDING))
 	{
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index b2dd8bb63f..0a8ff4b339 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -811,6 +811,7 @@ bool idle_startup()
 		show_debug_menus();
 
 		// Hide the splash screen
+		LL_DEBUGS("AppInit") << "Hide the splash screen and show window" << LL_ENDL;
 		LLSplashScreen::hide();
 		// Push our window frontmost
 		gViewerWindow->getWindow()->show();
@@ -818,9 +819,12 @@ bool idle_startup()
 		// DEV-16927.  The following code removes errant keystrokes that happen while the window is being 
 		// first made visible.
 #ifdef _WIN32
+        LL_DEBUGS("AppInit") << "Processing PeekMessage" << LL_ENDL;
 		MSG msg;
 		while( PeekMessage( &msg, /*All hWnds owned by this thread */ NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE ) )
-		{ }
+        {
+        }
+        LL_DEBUGS("AppInit") << "PeekMessage processed" << LL_ENDL;
 #endif
         display_startup();
         timeout.reset();
diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp
index 5235914c34..c5e31ff8e6 100644
--- a/indra/newview/lltool.cpp
+++ b/indra/newview/lltool.cpp
@@ -60,7 +60,7 @@ LLTool::~LLTool()
 	}
 }
 
-BOOL LLTool::handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down)
+BOOL LLTool::handleAnyMouseClick(S32 x, S32 y, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down)
 {
 	BOOL result = LLMouseHandler::handleAnyMouseClick(x, y, mask, clicktype, down);
 	
@@ -83,9 +83,9 @@ BOOL LLTool::handleMouseDown(S32 x, S32 y, MASK mask)
 		LL_INFOS() << "LLTool left mouse down" << LL_ENDL;
 	}
 	// by default, didn't handle it
-	// AGENT_CONTROL_LBUTTON_DOWN is handled by scanMouse() and scanKey()
 	// LL_INFOS() << "LLTool::handleMouseDown" << LL_ENDL;
-	return FALSE;
+	gAgent.setControlFlags(AGENT_CONTROL_LBUTTON_DOWN);
+	return TRUE;
 }
 
 BOOL LLTool::handleMouseUp(S32 x, S32 y, MASK mask)
@@ -95,8 +95,8 @@ BOOL LLTool::handleMouseUp(S32 x, S32 y, MASK mask)
 		LL_INFOS() << "LLTool left mouse up" << LL_ENDL;
 	}
 	// by default, didn't handle it
-	// AGENT_CONTROL_LBUTTON_UP is handled by scanMouse() and scanKey()
 	// LL_INFOS() << "LLTool::handleMouseUp" << LL_ENDL;
+	gAgent.setControlFlags(AGENT_CONTROL_LBUTTON_UP);
 	return TRUE;
 }
 
diff --git a/indra/newview/lltool.h b/indra/newview/lltool.h
index 41a38804ce..308983afda 100644
--- a/indra/newview/lltool.h
+++ b/indra/newview/lltool.h
@@ -49,7 +49,7 @@ public:
 	virtual BOOL isView() const { return FALSE; }
 
 	// Virtual functions inherited from LLMouseHandler
-	virtual BOOL	handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down);
+	virtual BOOL	handleAnyMouseClick(S32 x, S32 y, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down);
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleMiddleMouseDown(S32 x, S32 y, MASK mask);
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 2476b3f285..12346f16d7 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -83,6 +83,7 @@ LLToolPie::LLToolPie()
 	mMouseOutsideSlop( false ),
 	mMouseSteerX(-1),
 	mMouseSteerY(-1),
+	mBlockClickToWalk(false),
 	mClickAction(0),
 	mClickActionBuyEnabled( gSavedSettings.getBOOL("ClickActionBuyEnabled") ),
 	mClickActionPayEnabled( gSavedSettings.getBOOL("ClickActionPayEnabled") ),
@@ -90,7 +91,7 @@ LLToolPie::LLToolPie()
 {
 }
 
-BOOL LLToolPie::handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down)
+BOOL LLToolPie::handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down)
 {
 	BOOL result = LLMouseHandler::handleAnyMouseClick(x, y, mask, clicktype, down);
 	
@@ -171,8 +172,10 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 	mPick.mKeyMask = mask;
 
 	mMouseButtonDown = true;
+	
+	handleLeftClickPick();
 
-    return handleLeftClickPick();
+	return TRUE;
 }
 
 // Spawn context menus on right mouse down so you can drag over and select
@@ -200,14 +203,31 @@ BOOL LLToolPie::handleRightMouseUp(S32 x, S32 y, MASK mask)
 	return LLTool::handleRightMouseUp(x, y, mask);
 }
 
+BOOL LLToolPie::handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y)
+{
+    BOOL res = FALSE;
+    // mHoverPick should have updated on its own and we should have a face
+    // in LLViewerMediaFocus in case of media, so just reuse mHoverPick
+    if (mHoverPick.mUVCoords.mV[VX] >= 0.f && mHoverPick.mUVCoords.mV[VY] >= 0.f)
+    {
+        res = LLViewerMediaFocus::getInstance()->handleScrollWheel(mHoverPick.mUVCoords, clicks_x, clicks_y);
+    }
+    else
+    {
+        // this won't provide correct coordinates in case of object selection
+        res = LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks_x, clicks_y);
+    }
+    return res;
+}
+
 BOOL LLToolPie::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	return LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks);
+    return handleScrollWheelAny(x, y, 0, clicks);
 }
 
 BOOL LLToolPie::handleScrollHWheel(S32 x, S32 y, S32 clicks)
 {
-    return LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks);
+    return handleScrollWheelAny(x, y, clicks, 0);
 }
 
 // True if you selected an object.
@@ -371,6 +391,8 @@ BOOL LLToolPie::handleLeftClickPick()
 	// put focus back "in world"
 	if (gFocusMgr.getKeyboardFocus())
 	{
+		// don't click to walk on attempt to give focus to world
+		mBlockClickToWalk = true;
 		gFocusMgr.setKeyboardFocus(NULL);
 	}
 
@@ -414,7 +436,7 @@ BOOL LLToolPie::handleLeftClickPick()
 		}
 		object = (LLViewerObject*)object->getParent();
 	}
-	if (object && object == gAgentAvatarp)
+	if (object && object == gAgentAvatarp && !gSavedSettings.getBOOL("ClickToWalk"))
 	{
 		// we left clicked on avatar, switch to focus mode
 		mMouseButtonDown = false;
@@ -431,6 +453,7 @@ BOOL LLToolPie::handleLeftClickPick()
 	//	LLFirstUse::useLeftClickNoHit();
 	/////////
 
+	// Eat the event
 	return LLTool::handleMouseDown(x, y, mask);
 }
 
@@ -537,97 +560,17 @@ void LLToolPie::resetSelection()
 	mClickAction = 0;
 }
 
-bool LLToolPie::walkToClickedLocation()
-{
-    if (gAgent.getFlying()							// don't auto-navigate while flying until that works
-        || !gAgentAvatarp
-        || gAgentAvatarp->isSitting())
-    {
-        return false;
-    }
-
-    LLPickInfo saved_pick = mPick;
-    mPick = gViewerWindow->pickImmediate(mHoverPick.mMousePt.mX, mHoverPick.mMousePt.mY,
-        FALSE /* ignore transparent */,
-        FALSE /* ignore rigged */,
-        FALSE /* ignore particles */);
-
-    if (mPick.mPickType == LLPickInfo::PICK_OBJECT)
-    {
-        if (mPick.getObject() && mPick.getObject()->isHUDAttachment())
-        {
-            mPick = saved_pick;
-            return false;
-        }
-    }
-
-    LLViewerObject* avatar_object = mPick.getObject();
-
-    // get pointer to avatar
-    while (avatar_object && !avatar_object->isAvatar())
-    {
-        avatar_object = (LLViewerObject*)avatar_object->getParent();
-    }
-
-    if (avatar_object && ((LLVOAvatar*)avatar_object)->isSelf())
-    {
-        const F64 SELF_CLICK_WALK_DISTANCE = 3.0;
-        // pretend we picked some point a bit in front of avatar
-        mPick.mPosGlobal = gAgent.getPositionGlobal() + LLVector3d(LLViewerCamera::instance().getAtAxis()) * SELF_CLICK_WALK_DISTANCE;
-    }
-
-    if ((mPick.mPickType == LLPickInfo::PICK_LAND && !mPick.mPosGlobal.isExactlyZero()) ||
-        (mPick.mObjectID.notNull() && !mPick.mPosGlobal.isExactlyZero()))
-    {
-        gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
-
-        if (mAutoPilotDestination) { mAutoPilotDestination->markDead(); }
-        mAutoPilotDestination = (LLHUDEffectBlob *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BLOB, FALSE);
-        mAutoPilotDestination->setPositionGlobal(mPick.mPosGlobal);
-        mAutoPilotDestination->setPixelSize(5);
-        mAutoPilotDestination->setColor(LLColor4U(170, 210, 190));
-        mAutoPilotDestination->setDuration(3.f);
-
-        LLVector3d pos = LLToolPie::getInstance()->getPick().mPosGlobal;
-        gAgent.startAutoPilotGlobal(pos, std::string(), NULL, NULL, NULL, 0.f, 0.03f, FALSE);
-        LLFirstUse::notMoving(false);
-        showVisualContextMenuEffect();
-        return true;
-    }
-    else
-    {
-        LL_DEBUGS() << "walk target was "
-            << (mPick.mPosGlobal.isExactlyZero() ? "zero" : "not zero")
-            << ", pick type was " << (mPick.mPickType == LLPickInfo::PICK_LAND ? "land" : "not land")
-            << ", pick object was " << mPick.mObjectID
-            << LL_ENDL;
-        mPick = saved_pick;
-        return false;
-    }
-    return true;
-}
-
-bool LLToolPie::teleportToClickedLocation()
+void LLToolPie::walkToClickedLocation()
 {
-    LLViewerObject* objp = mHoverPick.getObject();
-    LLViewerObject* parentp = objp ? objp->getRootEdit() : NULL;
-
-    bool is_in_world = mHoverPick.mObjectID.notNull() && objp && !objp->isHUDAttachment();
-    bool is_land = mHoverPick.mPickType == LLPickInfo::PICK_LAND;
-    bool pos_non_zero = !mHoverPick.mPosGlobal.isExactlyZero();
-    bool has_touch_handler = (objp && objp->flagHandleTouch()) || (parentp && parentp->flagHandleTouch());
-    bool has_click_action = final_click_action(objp);
-
-    if (pos_non_zero && (is_land || (is_in_world && !has_touch_handler && !has_click_action)))
-    {
-        LLVector3d pos = mHoverPick.mPosGlobal;
-        pos.mdV[VZ] += gAgentAvatarp->getPelvisToFoot();
-        gAgent.teleportViaLocationLookAt(pos);
-        mPick = mHoverPick;
-        showVisualContextMenuEffect();
-        return true;
-    }
-    return false;
+	if(mAutoPilotDestination) { mAutoPilotDestination->markDead(); }
+	mAutoPilotDestination = (LLHUDEffectBlob *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BLOB, FALSE);
+	mAutoPilotDestination->setPositionGlobal(mPick.mPosGlobal);
+	mAutoPilotDestination->setPixelSize(5);
+	mAutoPilotDestination->setColor(LLColor4U(170, 210, 190));
+	mAutoPilotDestination->setDuration(3.f);
+
+	LLVector3d pos = LLToolPie::getInstance()->getPick().mPosGlobal;
+	gAgent.startAutoPilotGlobal(pos, std::string(), NULL, NULL, NULL, 0.f, 0.03f, FALSE);
 }
 
 // When we get object properties after left-clicking on an object
@@ -703,7 +646,8 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
 		LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL;
 	}
 	else if (!mMouseOutsideSlop 
-		&& mMouseButtonDown)
+		&& mMouseButtonDown 
+		&& gSavedSettings.getBOOL("ClickToWalk"))
 	{
 		S32 delta_x = x - mMouseDownX;
 		S32 delta_y = y - mMouseDownY;
@@ -788,10 +732,70 @@ BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
         mDoubleClickTimer.reset();
     }
     LLViewerObject* obj = mPick.getObject();
+	U8 click_action = final_click_action(obj);
 
+	// let media have first pass at click
+	if (handleMediaMouseUp() || LLViewerMediaFocus::getInstance()->getFocus())
+	{
+		mBlockClickToWalk = true;
+	}
 	stopCameraSteering();
 	mMouseButtonDown = false;
 
+	if (click_action == CLICK_ACTION_NONE				// not doing 1-click action
+		&& gSavedSettings.getBOOL("ClickToWalk")		// click to walk enabled
+		&& !gAgent.getFlying()							// don't auto-navigate while flying until that works
+		&& gAgentAvatarp
+		&& !gAgentAvatarp->isSitting()
+		&& !mBlockClickToWalk							// another behavior hasn't cancelled click to walk
+        )
+	{
+        // We may be doing click to walk, but we don't want to use a target on
+        // a transparent object because the user thought they were clicking on
+        // whatever they were seeing through it, so recompute what was clicked on
+        // ignoring transparent objects
+        LLPickInfo savedPick = mPick;
+        mPick = gViewerWindow->pickImmediate(savedPick.mMousePt.mX, savedPick.mMousePt.mY,
+                                             FALSE /* ignore transparent */,
+                                             FALSE /* ignore rigged */,
+                                             FALSE /* ignore particles */);
+
+        if (!mPick.mPosGlobal.isExactlyZero()			// valid coordinates for pick
+            && (mPick.mPickType == LLPickInfo::PICK_LAND	// we clicked on land
+                || mPick.mObjectID.notNull()))				// or on an object
+        {
+            // handle special cases of steering picks
+            LLViewerObject* avatar_object = mPick.getObject();
+
+            // get pointer to avatar
+            while (avatar_object && !avatar_object->isAvatar())
+            {
+                avatar_object = (LLViewerObject*)avatar_object->getParent();
+            }
+
+            if (avatar_object && ((LLVOAvatar*)avatar_object)->isSelf())
+            {
+                const F64 SELF_CLICK_WALK_DISTANCE = 3.0;
+                // pretend we picked some point a bit in front of avatar
+                mPick.mPosGlobal = gAgent.getPositionGlobal() + LLVector3d(LLViewerCamera::instance().getAtAxis()) * SELF_CLICK_WALK_DISTANCE;
+            }
+            gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
+            walkToClickedLocation();
+            LLFirstUse::notMoving(false);
+
+            return TRUE;
+        }
+        else
+        {
+            LL_DEBUGS("maint5901") << "walk target was "
+                                   << (mPick.mPosGlobal.isExactlyZero() ? "zero" : "not zero")
+                                   << ", pick type was " << (mPick.mPickType == LLPickInfo::PICK_LAND ? "land" : "not land")
+                                   << ", pick object was " << mPick.mObjectID
+                                   << LL_ENDL;
+            // we didn't click to walk, so restore the original target
+            mPick = savedPick;
+        }
+	}
 	gViewerWindow->setCursor(UI_CURSOR_ARROW);
 	if (hasMouseCapture())
 	{
@@ -801,6 +805,7 @@ BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
 	LLToolMgr::getInstance()->clearTransientTool();
 	gAgentCamera.setLookAt(LOOKAT_TARGET_CONVERSATION, obj); // maybe look at object/person clicked on
 
+	mBlockClickToWalk = false;
 	return LLTool::handleMouseUp(x, y, mask);
 }
 
@@ -826,13 +831,66 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 		return TRUE;
 	}
     
-	if (!mDoubleClickTimer.getStarted() || (mDoubleClickTimer.getElapsedTimeF32() > 0.3f))
+    	if (!mDoubleClickTimer.getStarted() || (mDoubleClickTimer.getElapsedTimeF32() > 0.3f))
 	{
 		mDoubleClickTimer.stop();
 		return FALSE;
 	}
 	mDoubleClickTimer.stop();
 
+	if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
+	{
+        // We may be doing double click to walk, but we don't want to use a target on
+        // a transparent object because the user thought they were clicking on
+        // whatever they were seeing through it, so recompute what was clicked on
+        // ignoring transparent objects
+        LLPickInfo savedPick = mPick;
+        mPick = gViewerWindow->pickImmediate(savedPick.mMousePt.mX, savedPick.mMousePt.mY,
+                                             FALSE /* ignore transparent */,
+                                             FALSE /* ignore rigged */,
+                                             FALSE /* ignore particles */);
+
+        if(mPick.mPickType == LLPickInfo::PICK_OBJECT)
+        {
+            if (mPick.getObject() && mPick.getObject()->isHUDAttachment())
+            {
+                mPick = savedPick;
+                return FALSE;
+            }
+        }
+
+		if ((mPick.mPickType == LLPickInfo::PICK_LAND && !mPick.mPosGlobal.isExactlyZero()) ||
+			(mPick.mObjectID.notNull()  && !mPick.mPosGlobal.isExactlyZero()))
+		{
+			walkToClickedLocation();
+			return TRUE;
+		}
+        else
+        {
+            // restore the original pick for any other purpose
+            mPick = savedPick;
+        }
+	}
+	else if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+	{
+		LLViewerObject* objp = mPick.getObject();
+		LLViewerObject* parentp = objp ? objp->getRootEdit() : NULL;
+
+		bool is_in_world = mPick.mObjectID.notNull() && objp && !objp->isHUDAttachment();
+		bool is_land = mPick.mPickType == LLPickInfo::PICK_LAND;
+		bool pos_non_zero = !mPick.mPosGlobal.isExactlyZero();
+		bool has_touch_handler = (objp && objp->flagHandleTouch()) || (parentp && parentp->flagHandleTouch());
+		bool has_click_action = final_click_action(objp);
+
+		if (pos_non_zero && (is_land || (is_in_world && !has_touch_handler && !has_click_action)))
+		{
+			LLVector3d pos = mPick.mPosGlobal;
+			pos.mdV[VZ] += gAgentAvatarp->getPelvisToFoot();
+			gAgent.teleportViaLocationLookAt(pos);
+			return TRUE;
+		}
+	}
+
 	return FALSE;
 }
 
@@ -1364,6 +1422,7 @@ void LLToolPie::VisitHomePage(const LLPickInfo& info)
 void LLToolPie::handleSelect()
 {
 	// tool is reselected when app gets focus, etc.
+	mBlockClickToWalk = true;	
 }
 
 void LLToolPie::handleDeselect()
@@ -1424,7 +1483,7 @@ void LLToolPie::stopCameraSteering()
 
 bool LLToolPie::inCameraSteerMode()
 {
-	return mMouseButtonDown && mMouseOutsideSlop;
+	return mMouseButtonDown && mMouseOutsideSlop && gSavedSettings.getBOOL("ClickToWalk");
 }
 
 // true if x,y outside small box around start_x,start_y
@@ -1875,6 +1934,7 @@ void LLToolPie::startCameraSteering()
 {
 	LLFirstUse::notMoving(false);
 	mMouseOutsideSlop = true;
+	mBlockClickToWalk = true;
 
 	if (gAgentCamera.getFocusOnAvatar())
 	{
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index ac6751aac0..2d6c22f425 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -42,13 +42,14 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
 public:
 
 	// Virtual functions inherited from LLMouseHandler
-	virtual BOOL		handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down);
+	virtual BOOL		handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down);
 	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL		handleRightMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL		handleRightMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
+	BOOL				handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y);
 	virtual BOOL		handleScrollWheel(S32 x, S32 y, S32 clicks);
 	virtual BOOL		handleScrollHWheel(S32 x, S32 y, S32 clicks);
 	virtual BOOL		handleToolTip(S32 x, S32 y, MASK mask);
@@ -67,8 +68,8 @@ public:
 	LLViewerObject*		getClickActionObject() { return mClickActionObject; }
 	LLObjectSelection*	getLeftClickSelection() { return (LLObjectSelection*)mLeftClickSelection; }
 	void 				resetSelection();
-	bool				walkToClickedLocation();
-	bool				teleportToClickedLocation();
+	void				walkToClickedLocation();
+	void				blockClickToWalk() { mBlockClickToWalk = true; }
 	void				stopClickToWalk();
 	
 	static void			selectionPropertiesReceived();
@@ -110,6 +111,7 @@ private:
 	LLPointer<LLHUDEffectBlob>	mAutoPilotDestination;
 	LLPointer<LLHUDEffectBlob>	mMouseSteerGrabPoint;
 	bool				mClockwise;			
+	bool				mBlockClickToWalk;
 	LLUUID				mMediaMouseCaptureID;
 	LLPickInfo			mPick;
 	LLPickInfo			mHoverPick;
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 2b1f4b138f..4c7eb41418 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -253,6 +253,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
 	if (gWindowResized)
 	{ //skip render on frames where window has been resized
+		LL_DEBUGS("Window") << "Resizing window" << LL_ENDL;
 		LL_RECORD_BLOCK_TIME(FTM_RESIZE_WINDOW);
 		gGL.flush();
 		glClear(GL_COLOR_BUFFER_BIT);
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
deleted file mode 100644
index ad4b9d4215..0000000000
--- a/indra/newview/llviewerinput.cpp
+++ /dev/null
@@ -1,1528 +0,0 @@
-/** 
- * @file llviewerinput.cpp
- * @brief LLViewerInput class implementation
- *
- * $LicenseInfo:firstyear=2005&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llviewerinput.h"
-
-#include "llappviewer.h"
-#include "llfloaterreg.h"
-#include "llmath.h"
-#include "llagent.h"
-#include "llagentcamera.h"
-#include "llfloaterimnearbychat.h"
-#include "llfocusmgr.h"
-#include "llkeybind.h" // LLKeyData
-#include "llmorphview.h"
-#include "llmoveview.h"
-#include "lltoolfocus.h"
-#include "lltoolpie.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "llvoavatarself.h"
-#include "llfloatercamera.h"
-#include "llinitparam.h"
-#include "llselectmgr.h"
-
-//
-// Constants
-//
-
-const F32 FLY_TIME = 0.5f;
-const F32 FLY_FRAMES = 4;
-
-const F32 NUDGE_TIME = 0.25f;  // in seconds
-const S32 NUDGE_FRAMES = 2;
-const F32 ORBIT_NUDGE_RATE = 0.05f;  // fraction of normal speed
-
-const LLKeyData agent_control_lbutton(CLICK_LEFT, KEY_NONE, MASK_NONE, true);
-
-struct LLKeyboardActionRegistry 
-:	public LLRegistrySingleton<std::string, boost::function<bool (EKeystate keystate)>, LLKeyboardActionRegistry>
-{
-	LLSINGLETON_EMPTY_CTOR(LLKeyboardActionRegistry);
-};
-
-LLViewerInput gViewerInput;
-
-bool agent_jump( EKeystate s )
-{
-	static BOOL first_fly_attempt(TRUE);
-	if (KEYSTATE_UP == s)
-	{
-		first_fly_attempt = TRUE;
-		return true;
-	}
-	F32 time = gKeyboard->getCurKeyElapsedTime();
-	S32 frame_count = ll_round(gKeyboard->getCurKeyElapsedFrameCount());
-
-	if( time < FLY_TIME 
-		|| frame_count <= FLY_FRAMES 
-		|| gAgent.upGrabbed()
-		|| !gSavedSettings.getBOOL("AutomaticFly"))
-	{
-		gAgent.moveUp(1);
-	}
-	else
-	{
-		gAgent.setFlying(TRUE, first_fly_attempt);
-		first_fly_attempt = FALSE;
-		gAgent.moveUp(1);
-	}
-	return true;
-}
-
-bool agent_push_down( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgent.moveUp(-1);
-	return true;
-}
-
-static void agent_check_temporary_run(LLAgent::EDoubleTapRunMode mode)
-{
-	if (gAgent.mDoubleTapRunMode == mode &&
-		gAgent.getRunning() &&
-		!gAgent.getAlwaysRun())
-	{
-		// Turn off temporary running.
-		gAgent.clearRunning();
-		gAgent.sendWalkRun(gAgent.getRunning());
-	}
-}
-
-static void agent_handle_doubletap_run(EKeystate s, LLAgent::EDoubleTapRunMode mode)
-{
-	if (KEYSTATE_UP == s)
-	{
-		// Note: in case shift is already released, slide left/right run
-		// will be released in agent_turn_left()/agent_turn_right()
-		agent_check_temporary_run(mode);
-	}
-	else if (gSavedSettings.getBOOL("AllowTapTapHoldRun") &&
-		 KEYSTATE_DOWN == s &&
-		 !gAgent.getRunning())
-	{
-		if (gAgent.mDoubleTapRunMode == mode &&
-		    gAgent.mDoubleTapRunTimer.getElapsedTimeF32() < NUDGE_TIME)
-		{
-			// Same walk-key was pushed again quickly; this is a
-			// double-tap so engage temporary running.
-			gAgent.setRunning();
-			gAgent.sendWalkRun(gAgent.getRunning());
-		}
-
-		// Pressing any walk-key resets the double-tap timer
-		gAgent.mDoubleTapRunTimer.reset();
-		gAgent.mDoubleTapRunMode = mode;
-	}
-}
-
-static void agent_push_forwardbackward( EKeystate s, S32 direction, LLAgent::EDoubleTapRunMode mode )
-{
-	agent_handle_doubletap_run(s, mode);
-	if (KEYSTATE_UP == s) return;
-
-	F32 time = gKeyboard->getCurKeyElapsedTime();
-	S32 frame_count = ll_round(gKeyboard->getCurKeyElapsedFrameCount());
-
-	if( time < NUDGE_TIME || frame_count <= NUDGE_FRAMES)
-	{
-		gAgent.moveAtNudge(direction);
-	}
-	else
-	{
-		gAgent.moveAt(direction);
-	}
-}
-
-bool camera_move_forward( EKeystate s );
-
-bool agent_push_forward( EKeystate s )
-{
-	if(gAgent.isMovementLocked()) return true;
-
-	//in free camera control mode we need to intercept keyboard events for avatar movements
-	if (LLFloaterCamera::inFreeCameraMode())
-	{
-		camera_move_forward(s);
-	}
-	else
-	{
-		agent_push_forwardbackward(s, 1, LLAgent::DOUBLETAP_FORWARD);
-	}
-	return true;
-}
-
-bool camera_move_backward( EKeystate s );
-
-bool agent_push_backward( EKeystate s )
-{
-	if(gAgent.isMovementLocked()) return true;
-
-	//in free camera control mode we need to intercept keyboard events for avatar movements
-	if (LLFloaterCamera::inFreeCameraMode())
-	{
-		camera_move_backward(s);
-	}
-	else if (!gAgent.backwardGrabbed() && gAgentAvatarp->isSitting() && gSavedSettings.getBOOL("LeaveMouselook"))
-	{
-		gAgentCamera.changeCameraToThirdPerson();
-	}
-	else
-	{
-		agent_push_forwardbackward(s, -1, LLAgent::DOUBLETAP_BACKWARD);
-	}
-	return true;
-}
-
-static void agent_slide_leftright( EKeystate s, S32 direction, LLAgent::EDoubleTapRunMode mode )
-{
-	agent_handle_doubletap_run(s, mode);
-	if( KEYSTATE_UP == s ) return;
-	F32 time = gKeyboard->getCurKeyElapsedTime();
-	S32 frame_count = ll_round(gKeyboard->getCurKeyElapsedFrameCount());
-
-	if( time < NUDGE_TIME || frame_count <= NUDGE_FRAMES)
-	{
-		gAgent.moveLeftNudge(direction);
-	}
-	else
-	{
-		gAgent.moveLeft(direction);
-	}
-}
-
-
-bool agent_slide_left( EKeystate s )
-{
-	if(gAgent.isMovementLocked()) return true;
-	agent_slide_leftright(s, 1, LLAgent::DOUBLETAP_SLIDELEFT);
-	return true;
-}
-
-
-bool agent_slide_right( EKeystate s )
-{
-	if(gAgent.isMovementLocked()) return true;
-	agent_slide_leftright(s, -1, LLAgent::DOUBLETAP_SLIDERIGHT);
-	return true;
-}
-
-bool camera_spin_around_cw( EKeystate s );
-
-bool agent_turn_left(EKeystate s)
-{
-	//in free camera control mode we need to intercept keyboard events for avatar movements
-	if (LLFloaterCamera::inFreeCameraMode())
-	{
-		camera_spin_around_cw(s);
-		return true;
-	}
-
-	if(gAgent.isMovementLocked()) return false;
-
-	if (LLToolCamera::getInstance()->mouseSteerMode())
-	{
-		agent_slide_left(s);
-	}
-	else
-	{
-		if (KEYSTATE_UP == s)
-		{
-			// Check temporary running. In case user released 'left' key with shift already released.
-			agent_check_temporary_run(LLAgent::DOUBLETAP_SLIDELEFT);
-			return true;
-		}
-		F32 time = gKeyboard->getCurKeyElapsedTime();
-		gAgent.moveYaw( LLFloaterMove::getYawRate( time ) );
-	}
-	return true;
-}
-
-bool camera_spin_around_ccw( EKeystate s );
-
-bool agent_turn_right( EKeystate s )
-{
-	//in free camera control mode we need to intercept keyboard events for avatar movements
-	if (LLFloaterCamera::inFreeCameraMode())
-	{
-		camera_spin_around_ccw(s);
-		return true;
-	}
-
-	if(gAgent.isMovementLocked()) return false;
-
-	if (LLToolCamera::getInstance()->mouseSteerMode())
-	{
-		agent_slide_right(s);
-	}
-	else
-	{
-		if (KEYSTATE_UP == s)
-		{
-			// Check temporary running. In case user released 'right' key with shift already released.
-			agent_check_temporary_run(LLAgent::DOUBLETAP_SLIDERIGHT);
-			return true;
-		}
-		F32 time = gKeyboard->getCurKeyElapsedTime();
-		gAgent.moveYaw( -LLFloaterMove::getYawRate( time ) );
-	}
-	return true;
-}
-
-bool agent_look_up( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgent.movePitch(-1);
-	//gAgent.rotate(-2.f * DEG_TO_RAD, gAgent.getFrame().getLeftAxis() );
-	return true;
-}
-
-
-bool agent_look_down( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgent.movePitch(1);
-	//gAgent.rotate(2.f * DEG_TO_RAD, gAgent.getFrame().getLeftAxis() );
-	return true;
-}
-
-bool agent_toggle_fly( EKeystate s )
-{
-	// Only catch the edge
-	if (KEYSTATE_DOWN == s )
-	{
-		LLAgent::toggleFlying();
-	}
-	return true;
-}
-
-F32 get_orbit_rate()
-{
-	F32 time = gKeyboard->getCurKeyElapsedTime();
-	if( time < NUDGE_TIME )
-	{
-		F32 rate = ORBIT_NUDGE_RATE + time * (1 - ORBIT_NUDGE_RATE)/ NUDGE_TIME;
-		//LL_INFOS() << rate << LL_ENDL;
-		return rate;
-	}
-	else
-	{
-		return 1;
-	}
-}
-
-bool camera_spin_around_ccw( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setOrbitLeftKey( get_orbit_rate() );
-	return true;
-}
-
-
-bool camera_spin_around_cw( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setOrbitRightKey( get_orbit_rate() );
-	return true;
-}
-
-bool camera_spin_around_ccw_sitting( EKeystate s )
-{
-	if( KEYSTATE_UP == s && gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_SLIDERIGHT ) return true;
-	if (gAgent.rotateGrabbed() || gAgentCamera.sitCameraEnabled() || gAgent.getRunning())
-	{
-		//send keystrokes, but do not change camera
-		agent_turn_right(s);
-	}
-	else
-	{
-		//change camera but do not send keystrokes
-		gAgentCamera.unlockView();
-		gAgentCamera.setOrbitLeftKey( get_orbit_rate() );
-	}
-	return true;
-}
-
-
-bool camera_spin_around_cw_sitting( EKeystate s )
-{
-	if( KEYSTATE_UP == s && gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_SLIDELEFT ) return true;
-	if (gAgent.rotateGrabbed() || gAgentCamera.sitCameraEnabled() || gAgent.getRunning())
-	{
-		//send keystrokes, but do not change camera
-		agent_turn_left(s);
-	}
-	else
-	{
-		//change camera but do not send keystrokes
-		gAgentCamera.unlockView();
-		gAgentCamera.setOrbitRightKey( get_orbit_rate() );
-	}
-	return true;
-}
-
-
-bool camera_spin_over( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setOrbitUpKey( get_orbit_rate() );
-	return true;
-}
-
-
-bool camera_spin_under( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setOrbitDownKey( get_orbit_rate() );
-	return true;
-}
-
-bool camera_spin_over_sitting( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	if (gAgent.upGrabbed() || gAgentCamera.sitCameraEnabled())
-	{
-		//send keystrokes, but do not change camera
-		agent_jump(s);
-	}
-	else
-	{
-		//change camera but do not send keystrokes
-		gAgentCamera.setOrbitUpKey( get_orbit_rate() );
-	}
-	return true;
-}
-
-
-bool camera_spin_under_sitting( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	if (gAgent.downGrabbed() || gAgentCamera.sitCameraEnabled())
-	{
-		//send keystrokes, but do not change camera
-		agent_push_down(s);
-	}
-	else
-	{
-		//change camera but do not send keystrokes
-		gAgentCamera.setOrbitDownKey( get_orbit_rate() );
-	}
-	return true;
-}
-
-bool camera_move_forward( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setOrbitInKey( get_orbit_rate() );
-	return true;
-}
-
-
-bool camera_move_backward( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setOrbitOutKey( get_orbit_rate() );
-	return true;
-}
-
-bool camera_move_forward_sitting( EKeystate s )
-{
-	if( KEYSTATE_UP == s && gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_FORWARD ) return true;
-	if (gAgent.forwardGrabbed() || gAgentCamera.sitCameraEnabled() || (gAgent.getRunning() && !gAgent.getAlwaysRun()))
-	{
-		agent_push_forward(s);
-	}
-	else
-	{
-		gAgentCamera.setOrbitInKey( get_orbit_rate() );
-	}
-	return true;
-}
-
-bool camera_move_backward_sitting( EKeystate s )
-{
-	if( KEYSTATE_UP == s && gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_BACKWARD ) return true;
-
-	if (gAgent.backwardGrabbed() || gAgentCamera.sitCameraEnabled() || (gAgent.getRunning() && !gAgent.getAlwaysRun()))
-	{
-		agent_push_backward(s);
-	}
-	else
-	{
-		gAgentCamera.setOrbitOutKey( get_orbit_rate() );
-	}
-	return true;
-}
-
-bool camera_pan_up( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setPanUpKey( get_orbit_rate() );
-	return true;
-}
-
-bool camera_pan_down( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setPanDownKey( get_orbit_rate() );
-	return true;
-}
-
-bool camera_pan_left( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setPanLeftKey( get_orbit_rate() );
-	return true;
-}
-
-bool camera_pan_right( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setPanRightKey( get_orbit_rate() );
-	return true;
-}
-
-bool camera_pan_in( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setPanInKey( get_orbit_rate() );
-	return true;
-}
-
-bool camera_pan_out( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setPanOutKey( get_orbit_rate() );
-	return true;
-}
-
-bool camera_move_forward_fast( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setOrbitInKey(2.5f);
-	return true;
-}
-
-bool camera_move_backward_fast( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gAgentCamera.unlockView();
-	gAgentCamera.setOrbitOutKey(2.5f);
-	return true;
-}
-
-
-bool edit_avatar_spin_ccw( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gMorphView->setCameraDrivenByKeys( TRUE );
-	gAgentCamera.setOrbitLeftKey( get_orbit_rate() );
-	//gMorphView->orbitLeft( get_orbit_rate() );
-	return true;
-}
-
-
-bool edit_avatar_spin_cw( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gMorphView->setCameraDrivenByKeys( TRUE );
-	gAgentCamera.setOrbitRightKey( get_orbit_rate() );
-	//gMorphView->orbitRight( get_orbit_rate() );
-	return true;
-}
-
-bool edit_avatar_spin_over( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gMorphView->setCameraDrivenByKeys( TRUE );
-	gAgentCamera.setOrbitUpKey( get_orbit_rate() );
-	//gMorphView->orbitUp( get_orbit_rate() );
-	return true;
-}
-
-
-bool edit_avatar_spin_under( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gMorphView->setCameraDrivenByKeys( TRUE );
-	gAgentCamera.setOrbitDownKey( get_orbit_rate() );
-	//gMorphView->orbitDown( get_orbit_rate() );
-	return true;
-}
-
-bool edit_avatar_move_forward( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gMorphView->setCameraDrivenByKeys( TRUE );
-	gAgentCamera.setOrbitInKey( get_orbit_rate() );
-	//gMorphView->orbitIn();
-	return true;
-}
-
-
-bool edit_avatar_move_backward( EKeystate s )
-{
-	if( KEYSTATE_UP == s  ) return true;
-	gMorphView->setCameraDrivenByKeys( TRUE );
-	gAgentCamera.setOrbitOutKey( get_orbit_rate() );
-	//gMorphView->orbitOut();
-	return true;
-}
-
-bool stop_moving( EKeystate s )
-{
-	if( KEYSTATE_DOWN != s  ) return true;
-	// stop agent
-	gAgent.setControlFlags(AGENT_CONTROL_STOP);
-
-	// cancel autopilot
-	gAgent.stopAutoPilot();
-	return true;
-}
-
-bool start_chat( EKeystate s )
-{
-    if (LLAppViewer::instance()->quitRequested())
-    {
-        return true; // can't talk, gotta go, kthxbye!
-    }
-    if (KEYSTATE_DOWN != s) return true;
-
-	// start chat
-	LLFloaterIMNearbyChat::startChat(NULL);
-	return true;
-}
-
-bool start_gesture( EKeystate s )
-{
-	LLUICtrl* focus_ctrlp = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
-	if (KEYSTATE_UP == s &&
-		! (focus_ctrlp && focus_ctrlp->acceptsTextInput()))
-	{
- 		if ((LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->getCurrentChat().empty())
- 		{
- 			// No existing chat in chat editor, insert '/'
- 			LLFloaterIMNearbyChat::startChat("/");
- 		}
- 		else
- 		{
- 			// Don't overwrite existing text in chat editor
- 			LLFloaterIMNearbyChat::startChat(NULL);
- 		}
-	}
-	return true;
-}
-
-bool run_forward(EKeystate s)
-{
-    if (KEYSTATE_UP != s)
-    {
-        if (gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_FORWARD)
-        {
-            gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_FORWARD;
-        }
-        if (!gAgent.getRunning())
-        {
-            gAgent.setRunning();
-            gAgent.sendWalkRun(true);
-        }
-    }
-    else if(KEYSTATE_UP == s)
-    {
-        if (gAgent.mDoubleTapRunMode == LLAgent::DOUBLETAP_FORWARD)
-            gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_NONE;
-        gAgent.clearRunning();
-        gAgent.sendWalkRun(false);
-    }
-    agent_push_forward(s);
-    return true;
-}
-
-bool run_backward(EKeystate s)
-{
-    if (KEYSTATE_UP != s)
-    {
-        if (gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_BACKWARD)
-        {
-            gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_BACKWARD;
-        }
-        if (!gAgent.getRunning())
-        {
-            gAgent.setRunning();
-            gAgent.sendWalkRun(true);
-        }
-    }
-    else if (KEYSTATE_UP == s)
-    {
-        if (gAgent.mDoubleTapRunMode == LLAgent::DOUBLETAP_BACKWARD)
-            gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_NONE;
-        gAgent.clearRunning();
-        gAgent.sendWalkRun(false);
-    }
-    agent_push_backward(s);
-    return true;
-}
-
-bool run_left(EKeystate s)
-{
-    if (KEYSTATE_UP != s)
-    {
-        if (gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_SLIDELEFT)
-        {
-            gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_SLIDELEFT;
-        }
-        if (!gAgent.getRunning())
-        {
-            gAgent.setRunning();
-            gAgent.sendWalkRun(true);
-        }
-    }
-    else if (KEYSTATE_UP == s)
-    {
-        if (gAgent.mDoubleTapRunMode == LLAgent::DOUBLETAP_SLIDELEFT)
-            gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_NONE;
-        gAgent.clearRunning();
-        gAgent.sendWalkRun(false);
-    }
-    agent_slide_left(s);
-    return true;
-}
-
-bool run_right(EKeystate s)
-{
-    if (KEYSTATE_UP != s)
-    {
-        if (gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_SLIDERIGHT)
-        {
-            gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_SLIDERIGHT;
-        }
-        if (!gAgent.getRunning())
-        {
-            gAgent.setRunning();
-            gAgent.sendWalkRun(true);
-        }
-    }
-    else if (KEYSTATE_UP == s)
-    {
-        if (gAgent.mDoubleTapRunMode == LLAgent::DOUBLETAP_SLIDERIGHT)
-            gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_NONE;
-        gAgent.clearRunning();
-        gAgent.sendWalkRun(false);
-    }
-    agent_slide_right(s);
-    return true;
-}
-
-bool toggle_run(EKeystate s)
-{
-    if (KEYSTATE_DOWN != s) return true;
-    bool run = gAgent.getAlwaysRun();
-    if (run)
-    {
-        gAgent.clearAlwaysRun();
-        gAgent.clearRunning();
-    }
-    else
-    {
-        gAgent.setAlwaysRun();
-        gAgent.setRunning();
-    }
-    gAgent.sendWalkRun(!run);
-	return true;
-}
-
-bool toggle_sit(EKeystate s)
-{
-    if (KEYSTATE_DOWN != s) return true;
-    if (gAgent.isSitting())
-    {
-        gAgent.standUp();
-    }
-    else
-    {
-        gAgent.sitDown();
-    }
-	return true;
-}
-
-bool toggle_pause_media(EKeystate s) // analogue of play/pause button in top bar
-{
-    if (KEYSTATE_DOWN != s) return true;
-    bool pause = LLViewerMedia::getInstance()->isAnyMediaPlaying();
-    LLViewerMedia::getInstance()->setAllMediaPaused(pause);
-    return true;
-}
-
-bool toggle_enable_media(EKeystate s)
-{
-    if (KEYSTATE_DOWN != s) return true;
-    bool pause = LLViewerMedia::getInstance()->isAnyMediaPlaying() || LLViewerMedia::getInstance()->isAnyMediaShowing();
-    LLViewerMedia::getInstance()->setAllMediaEnabled(!pause);
-    return true;
-}
-
-bool walk_to(EKeystate s)
-{
-    if (KEYSTATE_DOWN != s) return true;
-    return LLToolPie::getInstance()->walkToClickedLocation();
-}
-
-bool teleport_to(EKeystate s)
-{
-    if (KEYSTATE_DOWN != s) return true;
-    return LLToolPie::getInstance()->teleportToClickedLocation();
-}
-
-bool toggle_voice(EKeystate s)
-{
-    if (KEYSTATE_DOWN != s) return true;
-    if (!LLAgent::isActionAllowed("speak")) return false;
-    LLVoiceClient::getInstance()->toggleUserPTTState();
-    return true;
-}
-
-bool voice_follow_key(EKeystate s)
-{
-    if (KEYSTATE_DOWN == s)
-    {
-        if (!LLAgent::isActionAllowed("speak")) return false;
-        LLVoiceClient::getInstance()->setUserPTTState(true);
-        return true;
-    }
-    else if (KEYSTATE_UP == s && LLVoiceClient::getInstance()->getUserPTTState())
-    {
-        LLVoiceClient::getInstance()->setUserPTTState(false);
-        return true;
-    }
-    return false;
-}
-
-bool agen_control_lbutton_handle(EKeystate s)
-{
-    switch (s)
-    {
-    case KEYSTATE_DOWN:
-        gAgent.setControlFlags(AGENT_CONTROL_LBUTTON_DOWN);
-        break;
-    case KEYSTATE_UP:
-        gAgent.setControlFlags(AGENT_CONTROL_LBUTTON_UP);
-        break;
-    default:
-        break;
-    }
-    return true;
-}
-
-#define REGISTER_KEYBOARD_ACTION(KEY, ACTION) LLREGISTER_STATIC(LLKeyboardActionRegistry, KEY, ACTION);
-REGISTER_KEYBOARD_ACTION("jump", agent_jump);
-REGISTER_KEYBOARD_ACTION("push_down", agent_push_down);
-REGISTER_KEYBOARD_ACTION("push_forward", agent_push_forward);
-REGISTER_KEYBOARD_ACTION("push_backward", agent_push_backward);
-REGISTER_KEYBOARD_ACTION("look_up", agent_look_up);
-REGISTER_KEYBOARD_ACTION("look_down", agent_look_down);
-REGISTER_KEYBOARD_ACTION("toggle_fly", agent_toggle_fly);
-REGISTER_KEYBOARD_ACTION("turn_left", agent_turn_left);
-REGISTER_KEYBOARD_ACTION("turn_right", agent_turn_right);
-REGISTER_KEYBOARD_ACTION("slide_left", agent_slide_left);
-REGISTER_KEYBOARD_ACTION("slide_right", agent_slide_right);
-REGISTER_KEYBOARD_ACTION("spin_around_ccw", camera_spin_around_ccw);
-REGISTER_KEYBOARD_ACTION("spin_around_cw", camera_spin_around_cw);
-REGISTER_KEYBOARD_ACTION("spin_around_ccw_sitting", camera_spin_around_ccw_sitting);
-REGISTER_KEYBOARD_ACTION("spin_around_cw_sitting", camera_spin_around_cw_sitting);
-REGISTER_KEYBOARD_ACTION("spin_over", camera_spin_over);
-REGISTER_KEYBOARD_ACTION("spin_under", camera_spin_under);
-REGISTER_KEYBOARD_ACTION("spin_over_sitting", camera_spin_over_sitting);
-REGISTER_KEYBOARD_ACTION("spin_under_sitting", camera_spin_under_sitting);
-REGISTER_KEYBOARD_ACTION("move_forward", camera_move_forward);
-REGISTER_KEYBOARD_ACTION("move_backward", camera_move_backward);
-REGISTER_KEYBOARD_ACTION("move_forward_sitting", camera_move_forward_sitting);
-REGISTER_KEYBOARD_ACTION("move_backward_sitting", camera_move_backward_sitting);
-REGISTER_KEYBOARD_ACTION("pan_up", camera_pan_up);
-REGISTER_KEYBOARD_ACTION("pan_down", camera_pan_down);
-REGISTER_KEYBOARD_ACTION("pan_left", camera_pan_left);
-REGISTER_KEYBOARD_ACTION("pan_right", camera_pan_right);
-REGISTER_KEYBOARD_ACTION("pan_in", camera_pan_in);
-REGISTER_KEYBOARD_ACTION("pan_out", camera_pan_out);
-REGISTER_KEYBOARD_ACTION("move_forward_fast", camera_move_forward_fast);
-REGISTER_KEYBOARD_ACTION("move_backward_fast", camera_move_backward_fast);
-REGISTER_KEYBOARD_ACTION("edit_avatar_spin_ccw", edit_avatar_spin_ccw);
-REGISTER_KEYBOARD_ACTION("edit_avatar_spin_cw", edit_avatar_spin_cw);
-REGISTER_KEYBOARD_ACTION("edit_avatar_spin_over", edit_avatar_spin_over);
-REGISTER_KEYBOARD_ACTION("edit_avatar_spin_under", edit_avatar_spin_under);
-REGISTER_KEYBOARD_ACTION("edit_avatar_move_forward", edit_avatar_move_forward);
-REGISTER_KEYBOARD_ACTION("edit_avatar_move_backward", edit_avatar_move_backward);
-REGISTER_KEYBOARD_ACTION("stop_moving", stop_moving);
-REGISTER_KEYBOARD_ACTION("start_chat", start_chat);
-REGISTER_KEYBOARD_ACTION("start_gesture", start_gesture);
-REGISTER_KEYBOARD_ACTION("run_forward", run_forward);
-REGISTER_KEYBOARD_ACTION("run_backward", run_backward);
-REGISTER_KEYBOARD_ACTION("run_left", run_left);
-REGISTER_KEYBOARD_ACTION("run_right", run_right);
-REGISTER_KEYBOARD_ACTION("toggle_run", toggle_run);
-REGISTER_KEYBOARD_ACTION("toggle_sit", toggle_sit);
-REGISTER_KEYBOARD_ACTION("toggle_pause_media", toggle_pause_media);
-REGISTER_KEYBOARD_ACTION("toggle_enable_media", toggle_enable_media);
-REGISTER_KEYBOARD_ACTION("teleport_to", teleport_to);
-REGISTER_KEYBOARD_ACTION("walk_to", walk_to);
-REGISTER_KEYBOARD_ACTION("toggle_voice", toggle_voice);
-REGISTER_KEYBOARD_ACTION("voice_follow_key", voice_follow_key);
-#undef REGISTER_KEYBOARD_ACTION
-
-LLViewerInput::LLViewerInput()
-{
-    resetBindings();
-
-	for (S32 i = 0; i < KEY_COUNT; i++)
-	{
-		mKeyHandledByUI[i] = FALSE;
-    }
-    for (S32 i = 0; i < CLICK_COUNT; i++)
-    {
-        mMouseLevel[i] = MOUSE_STATE_SILENT;
-    }
-	// we want the UI to never see these keys so that they can always control the avatar/camera
-	for(KEY k = KEY_PAD_UP; k <= KEY_PAD_DIVIDE; k++) 
-	{
-		mKeysSkippedByUI.insert(k);	
-	}
-}
-
-// static
-BOOL LLViewerInput::modeFromString(const std::string& string, S32 *mode)
-{
-	if (string == "FIRST_PERSON")
-	{
-		*mode = MODE_FIRST_PERSON;
-		return TRUE;
-	}
-	else if (string == "THIRD_PERSON")
-	{
-		*mode = MODE_THIRD_PERSON;
-		return TRUE;
-	}
-	else if (string == "EDIT_AVATAR")
-	{
-		*mode = MODE_EDIT_AVATAR;
-		return TRUE;
-	}
-	else if (string == "SITTING")
-	{
-		*mode = MODE_SITTING;
-		return TRUE;
-	}
-	else
-	{
-		*mode = MODE_THIRD_PERSON;
-		return FALSE;
-	}
-}
-
-// static
-BOOL LLViewerInput::mouseFromString(const std::string& string, EMouseClickType *mode)
-{
-    if (string == "LMB")
-    {
-        *mode = CLICK_LEFT;
-        return TRUE;
-    }
-    else if (string == "Double LMB")
-    {
-        *mode = CLICK_DOUBLELEFT;
-        return TRUE;
-    }
-    else if (string == "MMB")
-    {
-        *mode = CLICK_MIDDLE;
-        return TRUE;
-    }
-    else if (string == "MB4")
-    {
-        *mode = CLICK_BUTTON4;
-        return TRUE;
-    }
-    else if (string == "MB5")
-    {
-        *mode = CLICK_BUTTON5;
-        return TRUE;
-    }
-    else
-    {
-        *mode = CLICK_NONE;
-        return FALSE;
-    }
-}
-
-BOOL LLViewerInput::handleKey(KEY translated_key, MASK translated_mask, BOOL repeated)
-{
-	// check for re-map
-	EKeyboardMode mode = gViewerInput.getMode();
-	U32 keyidx = (translated_mask<<16) | translated_key;
-	key_remap_t::iterator iter = mRemapKeys[mode].find(keyidx);
-	if (iter != mRemapKeys[mode].end())
-	{
-		translated_key = (iter->second) & 0xff;
-		translated_mask = (iter->second)>>16;
-	}
-
-	// No repeats of F-keys
-	BOOL repeatable_key = (translated_key < KEY_F1 || translated_key > KEY_F12);
-	if (!repeatable_key && repeated)
-	{
-		return FALSE;
-	}
-
-	LL_DEBUGS("UserInput") << "keydown -" << translated_key << "-" << LL_ENDL;
-	// skip skipped keys
-	if(mKeysSkippedByUI.find(translated_key) != mKeysSkippedByUI.end()) 
-	{
-		mKeyHandledByUI[translated_key] = FALSE;
-		LL_INFOS("KeyboardHandling") << "Key wasn't handled by UI!" << LL_ENDL;
-	}
-	else
-	{
-		// it is sufficient to set this value once per call to handlekey
-		// without clearing it, as it is only used in the subsequent call to scanKey
-		mKeyHandledByUI[translated_key] = gViewerWindow->handleKey(translated_key, translated_mask); 
-		// mKeyHandledByUI is not what you think ... this indicates whether the UI has handled this keypress yet (any keypress)
-		// NOT whether some UI shortcut wishes to handle the keypress
-	  
-	}
-	return mKeyHandledByUI[translated_key];
-}
-
-BOOL LLViewerInput::handleKeyUp(KEY translated_key, MASK translated_mask)
-{
-	return gViewerWindow->handleKeyUp(translated_key, translated_mask);
-}
-
-BOOL LLViewerInput::bindKey(const S32 mode, const KEY key, const MASK mask, const std::string& function_name)
-{
-	S32 index;
-	typedef boost::function<bool(EKeystate)> function_t;
-	function_t function = NULL;
-	std::string name;
-
-	// Allow remapping of F2-F12
-	if (function_name[0] == 'F')
-	{
-		int c1 = function_name[1] - '0';
-		int c2 = function_name[2] ? function_name[2] - '0' : -1;
-		if (c1 >= 0 && c1 <= 9 && c2 >= -1 && c2 <= 9)
-		{
-			int idx = c1;
-			if (c2 >= 0)
-				idx = idx*10 + c2;
-			if (idx >=2 && idx <= 12)
-			{
-				U32 keyidx = ((mask<<16)|key);
-				(mRemapKeys[mode])[keyidx] = ((0<<16)|(KEY_F1+(idx-1)));
-				return TRUE;
-			}
-		}
-	}
-
-	// Not remapped, look for a function
-	
-	function_t* result = LLKeyboardActionRegistry::getValue(function_name);
-	if (result)
-	{
-		function = *result;
-	}
-
-	if (!function)
-	{
-		LL_ERRS() << "Can't bind key to function " << function_name << ", no function with this name found" << LL_ENDL;
-		return FALSE;
-	}
-
-	// check for duplicate first and overwrite
-    S32 size = mKeyBindings[mode].size();
-    for (index = 0; index < size; index++)
-    {
-        if (key == mKeyBindings[mode][index].mKey && mask == mKeyBindings[mode][index].mMask)
-            break;
-    }
-
-	if (mode >= MODE_COUNT)
-	{
-		LL_ERRS() << "LLKeyboard::bindKey() - unknown mode passed" << mode << LL_ENDL;
-		return FALSE;
-	}
-
-    LLKeyboardBinding bind;
-    bind.mKey = key;
-    bind.mMask = mask;
-    bind.mFunction = function;
-
-    mKeyBindings[mode].push_back(bind);
-
-	return TRUE;
-}
-
-BOOL LLViewerInput::bindMouse(const S32 mode, const EMouseClickType mouse, const MASK mask, const std::string& function_name)
-{
-    S32 index;
-    typedef boost::function<bool(EKeystate)> function_t;
-    function_t function = NULL;
-
-    function_t* result = LLKeyboardActionRegistry::getValue(function_name);
-    if (result)
-    {
-        function = *result;
-    }
-
-    if (!function)
-    {
-        LL_ERRS() << "Can't bind key to function " << function_name << ", no function with this name found" << LL_ENDL;
-        return FALSE;
-    }
-
-    // check for duplicate first and overwrite
-    S32 size = mMouseBindings[mode].size();
-    for (index = 0; index < size; index++)
-    {
-        if (mouse == mMouseBindings[mode][index].mMouse && mask == mMouseBindings[mode][index].mMask)
-            break;
-    }
-
-    if (mode >= MODE_COUNT)
-    {
-        LL_ERRS() << "LLKeyboard::bindKey() - unknown mode passed" << mode << LL_ENDL;
-        return FALSE;
-    }
-
-    LLMouseBinding bind;
-    bind.mMouse = mouse;
-    bind.mMask = mask;
-    bind.mFunction = function;
-
-    mMouseBindings[mode].push_back(bind);
-
-    return TRUE;
-}
-
-LLViewerInput::KeyBinding::KeyBinding()
-:	key("key"),
-	mouse("mouse"),
-	mask("mask"),
-	command("command")
-{}
-
-LLViewerInput::KeyMode::KeyMode()
-:	bindings("binding")
-{}
-
-LLViewerInput::Keys::Keys()
-:	first_person("first_person"),
-	third_person("third_person"),
-	sitting("sitting"),
-	edit_avatar("edit_avatar")
-{}
-
-void LLViewerInput::resetBindings()
-{
-    for (S32 i = 0; i < MODE_COUNT; i++)
-    {
-        mKeyBindings[i].clear();
-        mMouseBindings[i].clear();
-    }
-}
-
-S32 LLViewerInput::loadBindingsXML(const std::string& filename)
-{
-    resetBindings();
-
-	S32 binding_count = 0;
-	Keys keys;
-	LLSimpleXUIParser parser;
-
-	if (parser.readXUI(filename, keys) 
-		&& keys.validateBlock())
-	{
-		binding_count += loadBindingMode(keys.first_person, MODE_FIRST_PERSON);
-		binding_count += loadBindingMode(keys.third_person, MODE_THIRD_PERSON);
-		binding_count += loadBindingMode(keys.sitting, MODE_SITTING);
-		binding_count += loadBindingMode(keys.edit_avatar, MODE_EDIT_AVATAR);
-	}
-	return binding_count;
-}
-
-S32 count_masks(const MASK &mask)
-{
-    S32 res = 0;
-    if (mask & MASK_CONTROL)
-    {
-        res++;
-    }
-    if (mask & MASK_SHIFT)
-    {
-        res++;
-    }
-    if (mask & MASK_ALT)
-    {
-        res++;
-    }
-    return res;
-}
-
-bool compare_key_by_mask(LLKeyboardBinding i1, LLKeyboardBinding i2)
-{
-    return (count_masks(i1.mMask) > count_masks(i2.mMask));
-}
-
-bool compare_mouse_by_mask(LLMouseBinding i1, LLMouseBinding i2)
-{
-    return (count_masks(i1.mMask) > count_masks(i2.mMask));
-}
-
-S32 LLViewerInput::loadBindingMode(const LLViewerInput::KeyMode& keymode, S32 mode)
-{
-	S32 binding_count = 0;
-	for (LLInitParam::ParamIterator<KeyBinding>::const_iterator it = keymode.bindings.begin(), 
-			end_it = keymode.bindings.end();
-		it != end_it;
-		++it)
-	{
-        bool processed = false;
-        std::string key_str = it->key.getValue();
-        if (!key_str.empty() && key_str != "NONE")
-        {
-            KEY key;
-            LLKeyboard::keyFromString(key_str, &key);
-            if (key != KEY_NONE)
-            {
-                MASK mask;
-                LLKeyboard::maskFromString(it->mask, &mask);
-                bindKey(mode, key, mask, it->command);
-                processed = true;
-            }
-            else
-            {
-                LL_WARNS_ONCE() << "There might be issues in keybindings' file" << LL_ENDL;
-            }
-        }
-        if (!processed && it->mouse.isProvided() && !it->mouse.getValue().empty())
-        {
-            EMouseClickType mouse;
-            mouseFromString(it->mouse.getValue(), &mouse);
-            if (mouse != CLICK_NONE)
-            {
-                MASK mask;
-                LLKeyboard::maskFromString(it->mask, &mask);
-                bindMouse(mode, mouse, mask, it->command);
-                processed = true;
-            }
-            else
-            {
-                LL_WARNS_ONCE() << "There might be issues in keybindings' file" << LL_ENDL;
-            }
-        }
-        if (processed)
-        {
-            // total
-            binding_count++;
-        }
-    }
-
-    // sort lists by mask (so that Shift+W is executed before W, if both are assigned, but if Shift+W is not assigned W should be executed)
-    std::sort(mKeyBindings[mode].begin(), mKeyBindings[mode].end(), compare_key_by_mask);
-    std::sort(mMouseBindings[mode].begin(), mMouseBindings[mode].end(), compare_mouse_by_mask);
-
-	return binding_count;
-}
-
-EKeyboardMode LLViewerInput::getMode() const
-{
-	if ( gAgentCamera.cameraMouselook() )
-	{
-		return MODE_FIRST_PERSON;
-	}
-	else if ( gMorphView && gMorphView->getVisible())
-	{
-		return MODE_EDIT_AVATAR;
-	}
-	else if (isAgentAvatarValid() && gAgentAvatarp->isSitting())
-	{
-		return MODE_SITTING;
-	}
-	else
-	{
-		return MODE_THIRD_PERSON;
-	}
-}
-
-bool LLViewerInput::scanKey(const std::vector<LLKeyboardBinding> &binding,
-                               S32 binding_count,
-                               KEY key,
-                               MASK mask,
-                               BOOL key_down,
-                               BOOL key_up,
-                               BOOL key_level,
-                               bool repeat) const
-{
-	for (S32 i = 0; i < binding_count; i++)
-	{
-		if (binding[i].mKey == key)
-		{
-			if ((binding[i].mMask & mask) == binding[i].mMask)
-			{
-				bool res = false;
-				if (key_down && !repeat)
-				{
-					// ...key went down this frame, call function
-					res = binding[i].mFunction( KEYSTATE_DOWN );
-					return true;
-				}
-				else if (key_up)
-				{
-					// ...key went down this frame, call function
-					res = binding[i].mFunction( KEYSTATE_UP );
-				}
-				else if (key_level)
-				{
-					// ...key held down from previous frame
-					// Not windows, just call the function.
-					res = binding[i].mFunction( KEYSTATE_LEVEL );
-				}//if
-				// Key+Mask combinations are supposed to be unique, so we won't find anything else
-				return res;
-			}//if
-		}//if
-	}//for
-	return false;
-}
-
-// Called from scanKeyboard.
-bool LLViewerInput::scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level) const
-{
-	if (LLApp::isExiting())
-	{
-		return false;
-	}
-
-	S32 mode = getMode();
-	// Consider keyboard scanning as NOT mouse event. JC
-	MASK mask = gKeyboard->currentMask(FALSE);
-
-	if (mKeyHandledByUI[key])
-	{
-		return false;
-	}
-
-	// don't process key down on repeated keys
-	BOOL repeat = gKeyboard->getKeyRepeated(key);
-
-    bool res = scanKey(mKeyBindings[mode], mKeyBindings[mode].size(), key, mask, key_down, key_up, key_level, repeat);
-
-    if (!res && agent_control_lbutton.canHandle(CLICK_NONE, key, mask))
-    {
-        if (key_down && !repeat)
-        {
-            res = agen_control_lbutton_handle(KEYSTATE_DOWN);
-        }
-        if (key_up)
-        {
-            res = agen_control_lbutton_handle(KEYSTATE_UP);
-        }
-    }
-    return res;
-}
-
-BOOL LLViewerInput::handleMouse(LLWindow *window_impl, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down)
-{
-    BOOL handled = gViewerWindow->handleAnyMouseClick(window_impl, pos, mask, clicktype, down);
-
-    if (clicktype != CLICK_NONE)
-    {
-        // Special case
-        // If UI doesn't handle double click, LMB click is issued, so supres LMB 'down' when doubleclick is set
-        // handle !down as if we are handling doubleclick
-
-        bool double_click_sp = (clicktype == CLICK_LEFT
-            && (mMouseLevel[CLICK_DOUBLELEFT] != MOUSE_STATE_SILENT)
-            && mMouseLevel[CLICK_LEFT] == MOUSE_STATE_SILENT);
-        if (double_click_sp && !down)
-        {
-            // Process doubleclick instead
-            clicktype = CLICK_DOUBLELEFT;
-        }
-
-
-        if (double_click_sp && down)
-        {
-            // Consume click.
-            // Due to handling, double click that is not handled will be immediately followed by LMB click
-        }
-        // If UI handled 'down', it should handle 'up' as well
-        // If we handle 'down' not by UI, then we should handle 'up'/'level' regardless of UI
-        else if (handled)
-        {
-            // UI handled new 'down' so iterupt whatever state we were in.
-            if (mMouseLevel[clicktype] != MOUSE_STATE_SILENT)
-            {
-                if (mMouseLevel[clicktype] == MOUSE_STATE_DOWN)
-                {
-                    mMouseLevel[clicktype] = MOUSE_STATE_CLICK;
-                }
-                else
-                {
-                    mMouseLevel[clicktype] = MOUSE_STATE_UP;
-                }
-            }
-        }
-        else if (down)
-        {
-            if (mMouseLevel[clicktype] == MOUSE_STATE_DOWN)
-            {
-                // this is repeated hit (mouse does not repeat event until release)
-                // for now treat rapid clicking like mouse being held
-                mMouseLevel[clicktype] = MOUSE_STATE_LEVEL;
-            }
-            else
-            {
-                mMouseLevel[clicktype] = MOUSE_STATE_DOWN;
-            }
-        }
-        else if (mMouseLevel[clicktype] != MOUSE_STATE_SILENT)
-        {
-            // Released mouse key
-            if (mMouseLevel[clicktype] == MOUSE_STATE_DOWN)
-            {
-                mMouseLevel[clicktype] = MOUSE_STATE_CLICK;
-            }
-            else 
-            {
-                mMouseLevel[clicktype] = MOUSE_STATE_UP;
-            }
-        }
-    }
-
-    return handled;
-}
-
-bool LLViewerInput::scanMouse(const std::vector<LLMouseBinding> &binding, S32 binding_count, EMouseClickType mouse, MASK mask, EMouseState state) const
-{
-    for (S32 i = 0; i < binding_count; i++)
-    {
-        if (binding[i].mMouse == mouse && (binding[i].mMask & mask) == binding[i].mMask)
-        {
-            bool res = false;
-            switch (state)
-            {
-            case MOUSE_STATE_DOWN:
-                res = binding[i].mFunction(KEYSTATE_DOWN);
-                break;
-            case MOUSE_STATE_CLICK:
-                // Button went down and up in scope of single frame
-                // might not work best with some functions,
-                // but some function need specific states specifically
-                res = binding[i].mFunction(KEYSTATE_DOWN);
-                res |= binding[i].mFunction(KEYSTATE_UP);
-                break;
-            case MOUSE_STATE_LEVEL:
-                res = binding[i].mFunction(KEYSTATE_LEVEL);
-                break;
-            case MOUSE_STATE_UP:
-                res = binding[i].mFunction(KEYSTATE_UP);
-                break;
-            default:
-                break;
-            }
-            // Key+Mask combinations are supposed to be unique, no need to continue
-            return res;
-        }
-    }
-    return false;
-}
-
-// todo: this recods key, scanMouse() triggers functions with EKeystate
-bool LLViewerInput::scanMouse(EMouseClickType click, EMouseState state) const
-{
-    bool res = false;
-    S32 mode = getMode();
-    MASK mask = gKeyboard->currentMask(TRUE);
-    res = scanMouse(mMouseBindings[mode], mMouseBindings[mode].size(), click, mask, state);
-    // no user defined actions found or those actions can't handle the key/button, handle control if nessesary
-    if (!res && agent_control_lbutton.canHandle(click, KEY_NONE, mask))
-    {
-        switch (state)
-        {
-        case MOUSE_STATE_DOWN:
-            agen_control_lbutton_handle(KEYSTATE_DOWN);
-            res = true;
-            break;
-        case MOUSE_STATE_CLICK:
-            // might not work best with some functions,
-            // but some function need specific states too specifically
-            agen_control_lbutton_handle(KEYSTATE_DOWN);
-            agen_control_lbutton_handle(KEYSTATE_UP);
-            res = true;
-            break;
-        case MOUSE_STATE_UP:
-            agen_control_lbutton_handle(KEYSTATE_UP);
-            res = true;
-            break;
-        default:
-            break;
-        }
-    }
-    return res;
-}
-
-void LLViewerInput::scanMouse()
-{
-    for (S32 i = 0; i < CLICK_COUNT; i++)
-    {
-        if (mMouseLevel[i] != MOUSE_STATE_SILENT)
-        {
-            scanMouse((EMouseClickType)i, mMouseLevel[i]);
-            if (mMouseLevel[i] == MOUSE_STATE_DOWN)
-            {
-                // mouse doesn't support 'continued' state, so after handling, switch to LEVEL
-                mMouseLevel[i] = MOUSE_STATE_LEVEL;
-            }
-            else if (mMouseLevel[i] == MOUSE_STATE_UP || mMouseLevel[i] == MOUSE_STATE_CLICK)
-            {
-                mMouseLevel[i] = MOUSE_STATE_SILENT;
-            }
-        }
-    }
-}
diff --git a/indra/newview/llviewerinput.h b/indra/newview/llviewerinput.h
deleted file mode 100644
index 1fe55bd585..0000000000
--- a/indra/newview/llviewerinput.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/** 
- * @file llviewerinput.h
- * @brief LLViewerInput class header file
- *
- * $LicenseInfo:firstyear=2005&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLVIEWERINPUT_H
-#define LL_LLVIEWERINPUT_H
-
-#include "llkeyboard.h" // For EKeystate
-#include "llinitparam.h"
-
-const S32 MAX_KEY_BINDINGS = 128; // was 60
-
-class LLNamedFunction
-{
-public:
-	LLNamedFunction() : mFunction(NULL) { };
-	~LLNamedFunction() { };
-
-	std::string	mName;
-	LLKeyFunc	mFunction;
-};
-
-class LLKeyboardBinding
-{
-public:
-    KEY				mKey;
-    MASK			mMask;
-
-    LLKeyFunc		mFunction;
-};
-
-class LLMouseBinding
-{
-public:
-    EMouseClickType	mMouse;
-    MASK			mMask;
-
-    LLKeyFunc		mFunction;
-};
-
-
-typedef enum e_keyboard_mode
-{
-	MODE_FIRST_PERSON,
-	MODE_THIRD_PERSON,
-	MODE_EDIT_AVATAR,
-	MODE_SITTING,
-	MODE_COUNT
-} EKeyboardMode;
-
-class LLWindow;
-
-void bind_keyboard_functions();
-
-class LLViewerInput
-{
-public:
-	struct KeyBinding : public LLInitParam::Block<KeyBinding>
-	{
-		Mandatory<std::string>	key,
-								mask,
-								command;
-		Optional<std::string>	mouse; // Note, not mandatory for the sake of backward campatibility with keys.xml
-
-		KeyBinding();
-	};
-
-	struct KeyMode : public LLInitParam::Block<KeyMode>
-	{
-		Multiple<KeyBinding>		bindings;
-
-		KeyMode();
-	};
-
-	struct Keys : public LLInitParam::Block<Keys>
-	{
-		Optional<KeyMode>	first_person,
-							third_person,
-							sitting,
-							edit_avatar;
-
-		Keys();
-	};
-
-	LLViewerInput();
-
-	BOOL			handleKey(KEY key, MASK mask, BOOL repeated);
-	BOOL			handleKeyUp(KEY key, MASK mask);
-
-	S32				loadBindingsXML(const std::string& filename);										// returns number bound, 0 on error
-	EKeyboardMode	getMode() const;
-
-	static BOOL		modeFromString(const std::string& string, S32 *mode);			// False on failure
-	static BOOL		mouseFromString(const std::string& string, EMouseClickType *mode);// False on failure
-
-    bool            scanKey(KEY key,
-                            BOOL key_down,
-                            BOOL key_up,
-                            BOOL key_level) const;
-
-    // handleMouse() records state, scanMouse() goes through states, scanMouse(click) processes individual saved states after UI is done with them
-    BOOL            handleMouse(LLWindow *window_impl, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down);
-    void            scanMouse();
-
-private:
-    bool            scanKey(const std::vector<LLKeyboardBinding> &binding,
-                            S32 binding_count,
-                            KEY key,
-                            MASK mask,
-                            BOOL key_down,
-                            BOOL key_up,
-                            BOOL key_level,
-                            bool repeat) const;
-
-    enum EMouseState
-    {
-        MOUSE_STATE_DOWN, // key down this frame
-        MOUSE_STATE_CLICK, // key went up and down in scope of same frame
-        MOUSE_STATE_LEVEL, // clicked again fast, or never released
-        MOUSE_STATE_UP, // went up this frame
-        MOUSE_STATE_SILENT // notified about 'up', do not notify again
-    };
-    bool			scanMouse(EMouseClickType click, EMouseState state) const;
-    bool            scanMouse(const std::vector<LLMouseBinding> &binding,
-                          S32 binding_count,
-                          EMouseClickType mouse,
-                          MASK mask,
-                          EMouseState state) const;
-
-    S32				loadBindingMode(const LLViewerInput::KeyMode& keymode, S32 mode);
-    BOOL			bindKey(const S32 mode, const KEY key, const MASK mask, const std::string& function_name);
-    BOOL			bindMouse(const S32 mode, const EMouseClickType mouse, const MASK mask, const std::string& function_name);
-    void			resetBindings();
-
-	// Hold all the ugly stuff torn out to make LLKeyboard non-viewer-specific here
-
-    // TODO: at some point it is better to remake this, especially keyaboard part
-    // would be much better to send to functions actual state of the button than
-    // to send what we think function wants based on collection of bools (mKeyRepeated, mKeyLevel, mKeyDown)
-    std::vector<LLKeyboardBinding>	mKeyBindings[MODE_COUNT];
-    std::vector<LLMouseBinding>		mMouseBindings[MODE_COUNT];
-
-	typedef std::map<U32, U32> key_remap_t;
-	key_remap_t		mRemapKeys[MODE_COUNT];
-	std::set<KEY>	mKeysSkippedByUI;
-	BOOL			mKeyHandledByUI[KEY_COUNT];		// key processed successfully by UI
-
-    // This is indentical to what llkeyboard does (mKeyRepeated, mKeyLevel, mKeyDown e t c),
-    // just instead of remembering individually as bools,  we record state as enum
-    EMouseState		mMouseLevel[CLICK_COUNT];	// records of key state
-};
-
-extern LLViewerInput gViewerInput;
-
-#endif // LL_LLVIEWERINPUT_H
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
new file mode 100644
index 0000000000..6914e0fc2b
--- /dev/null
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -0,0 +1,1039 @@
+/** 
+ * @file llviewerkeyboard.cpp
+ * @brief LLViewerKeyboard class implementation
+ *
+ * $LicenseInfo:firstyear=2005&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llappviewer.h"
+#include "llfloaterreg.h"
+#include "llviewerkeyboard.h"
+#include "llmath.h"
+#include "llagent.h"
+#include "llagentcamera.h"
+#include "llfloaterimnearbychat.h"
+#include "llviewercontrol.h"
+#include "llfocusmgr.h"
+#include "llmorphview.h"
+#include "llmoveview.h"
+#include "lltoolfocus.h"
+#include "llviewerwindow.h"
+#include "llvoavatarself.h"
+#include "llfloatercamera.h"
+#include "llinitparam.h"
+
+//
+// Constants
+//
+
+const F32 FLY_TIME = 0.5f;
+const F32 FLY_FRAMES = 4;
+
+const F32 NUDGE_TIME = 0.25f;  // in seconds
+const S32 NUDGE_FRAMES = 2;
+const F32 ORBIT_NUDGE_RATE = 0.05f;  // fraction of normal speed
+
+struct LLKeyboardActionRegistry 
+:	public LLRegistrySingleton<std::string, boost::function<void (EKeystate keystate)>, LLKeyboardActionRegistry>
+{
+	LLSINGLETON_EMPTY_CTOR(LLKeyboardActionRegistry);
+};
+
+LLViewerKeyboard gViewerKeyboard;
+
+void agent_jump( EKeystate s )
+{
+	static BOOL first_fly_attempt(TRUE);
+	if (KEYSTATE_UP == s)
+	{
+		first_fly_attempt = TRUE;
+		return;
+	}
+	F32 time = gKeyboard->getCurKeyElapsedTime();
+	S32 frame_count = ll_round(gKeyboard->getCurKeyElapsedFrameCount());
+
+	if( time < FLY_TIME 
+		|| frame_count <= FLY_FRAMES 
+		|| gAgent.upGrabbed()
+		|| !gSavedSettings.getBOOL("AutomaticFly"))
+	{
+		gAgent.moveUp(1);
+	}
+	else
+	{
+		gAgent.setFlying(TRUE, first_fly_attempt);
+		first_fly_attempt = FALSE;
+		gAgent.moveUp(1);
+	}
+}
+
+void agent_push_down( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgent.moveUp(-1);
+}
+
+static void agent_check_temporary_run(LLAgent::EDoubleTapRunMode mode)
+{
+	if (gAgent.mDoubleTapRunMode == mode &&
+		gAgent.getRunning() &&
+		!gAgent.getAlwaysRun())
+	{
+		// Turn off temporary running.
+		gAgent.clearRunning();
+		gAgent.sendWalkRun(gAgent.getRunning());
+	}
+}
+
+static void agent_handle_doubletap_run(EKeystate s, LLAgent::EDoubleTapRunMode mode)
+{
+	if (KEYSTATE_UP == s)
+	{
+		// Note: in case shift is already released, slide left/right run
+		// will be released in agent_turn_left()/agent_turn_right()
+		agent_check_temporary_run(mode);
+	}
+	else if (gSavedSettings.getBOOL("AllowTapTapHoldRun") &&
+		 KEYSTATE_DOWN == s &&
+		 !gAgent.getRunning())
+	{
+		if (gAgent.mDoubleTapRunMode == mode &&
+		    gAgent.mDoubleTapRunTimer.getElapsedTimeF32() < NUDGE_TIME)
+		{
+			// Same walk-key was pushed again quickly; this is a
+			// double-tap so engage temporary running.
+			gAgent.setRunning();
+			gAgent.sendWalkRun(gAgent.getRunning());
+		}
+
+		// Pressing any walk-key resets the double-tap timer
+		gAgent.mDoubleTapRunTimer.reset();
+		gAgent.mDoubleTapRunMode = mode;
+	}
+}
+
+static void agent_push_forwardbackward( EKeystate s, S32 direction, LLAgent::EDoubleTapRunMode mode )
+{
+	agent_handle_doubletap_run(s, mode);
+	if (KEYSTATE_UP == s) return;
+
+	F32 time = gKeyboard->getCurKeyElapsedTime();
+	S32 frame_count = ll_round(gKeyboard->getCurKeyElapsedFrameCount());
+
+	if( time < NUDGE_TIME || frame_count <= NUDGE_FRAMES)
+	{
+		gAgent.moveAtNudge(direction);
+	}
+	else
+	{
+		gAgent.moveAt(direction);
+	}
+}
+
+void camera_move_forward( EKeystate s );
+
+void agent_push_forward( EKeystate s )
+{
+	if(gAgent.isMovementLocked()) return;
+
+	//in free camera control mode we need to intercept keyboard events for avatar movements
+	if (LLFloaterCamera::inFreeCameraMode())
+	{
+		camera_move_forward(s);
+	}
+	else
+	{
+		agent_push_forwardbackward(s, 1, LLAgent::DOUBLETAP_FORWARD);
+	}
+}
+
+void camera_move_backward( EKeystate s );
+
+void agent_push_backward( EKeystate s )
+{
+	if(gAgent.isMovementLocked()) return;
+
+	//in free camera control mode we need to intercept keyboard events for avatar movements
+	if (LLFloaterCamera::inFreeCameraMode())
+	{
+		camera_move_backward(s);
+	}
+	else if (!gAgent.backwardGrabbed() && gAgentAvatarp->isSitting() && gSavedSettings.getBOOL("LeaveMouselook"))
+	{
+		gAgentCamera.changeCameraToThirdPerson();
+	}
+	else
+	{
+		agent_push_forwardbackward(s, -1, LLAgent::DOUBLETAP_BACKWARD);
+	}
+}
+
+static void agent_slide_leftright( EKeystate s, S32 direction, LLAgent::EDoubleTapRunMode mode )
+{
+	agent_handle_doubletap_run(s, mode);
+	if( KEYSTATE_UP == s ) return;
+	F32 time = gKeyboard->getCurKeyElapsedTime();
+	S32 frame_count = ll_round(gKeyboard->getCurKeyElapsedFrameCount());
+
+	if( time < NUDGE_TIME || frame_count <= NUDGE_FRAMES)
+	{
+		gAgent.moveLeftNudge(direction);
+	}
+	else
+	{
+		gAgent.moveLeft(direction);
+	}
+}
+
+
+void agent_slide_left( EKeystate s )
+{
+	if(gAgent.isMovementLocked()) return;
+	agent_slide_leftright(s, 1, LLAgent::DOUBLETAP_SLIDELEFT);
+}
+
+
+void agent_slide_right( EKeystate s )
+{
+	if(gAgent.isMovementLocked()) return;
+	agent_slide_leftright(s, -1, LLAgent::DOUBLETAP_SLIDERIGHT);
+}
+
+void camera_spin_around_cw( EKeystate s );
+
+void agent_turn_left( EKeystate s )
+{
+	//in free camera control mode we need to intercept keyboard events for avatar movements
+	if (LLFloaterCamera::inFreeCameraMode())
+	{
+		camera_spin_around_cw(s);
+		return;
+	}
+
+	if(gAgent.isMovementLocked()) return;
+
+	if (LLToolCamera::getInstance()->mouseSteerMode())
+	{
+		agent_slide_left(s);
+	}
+	else
+	{
+		if (KEYSTATE_UP == s)
+		{
+			// Check temporary running. In case user released 'left' key with shift already released.
+			agent_check_temporary_run(LLAgent::DOUBLETAP_SLIDELEFT);
+			return;
+		}
+		F32 time = gKeyboard->getCurKeyElapsedTime();
+		gAgent.moveYaw( LLFloaterMove::getYawRate( time ) );
+	}
+}
+
+void camera_spin_around_ccw( EKeystate s );
+
+void agent_turn_right( EKeystate s )
+{
+	//in free camera control mode we need to intercept keyboard events for avatar movements
+	if (LLFloaterCamera::inFreeCameraMode())
+	{
+		camera_spin_around_ccw(s);
+		return;
+	}
+
+	if(gAgent.isMovementLocked()) return;
+
+	if (LLToolCamera::getInstance()->mouseSteerMode())
+	{
+		agent_slide_right(s);
+	}
+	else
+	{
+		if (KEYSTATE_UP == s)
+		{
+			// Check temporary running. In case user released 'right' key with shift already released.
+			agent_check_temporary_run(LLAgent::DOUBLETAP_SLIDERIGHT);
+			return;
+		}
+		F32 time = gKeyboard->getCurKeyElapsedTime();
+		gAgent.moveYaw( -LLFloaterMove::getYawRate( time ) );
+	}
+}
+
+void agent_look_up( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgent.movePitch(-1);
+	//gAgent.rotate(-2.f * DEG_TO_RAD, gAgent.getFrame().getLeftAxis() );
+}
+
+
+void agent_look_down( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgent.movePitch(1);
+	//gAgent.rotate(2.f * DEG_TO_RAD, gAgent.getFrame().getLeftAxis() );
+}
+
+void agent_toggle_fly( EKeystate s )
+{
+	// Only catch the edge
+	if (KEYSTATE_DOWN == s )
+	{
+		LLAgent::toggleFlying();
+	}
+}
+
+F32 get_orbit_rate()
+{
+	F32 time = gKeyboard->getCurKeyElapsedTime();
+	if( time < NUDGE_TIME )
+	{
+		F32 rate = ORBIT_NUDGE_RATE + time * (1 - ORBIT_NUDGE_RATE)/ NUDGE_TIME;
+		//LL_INFOS() << rate << LL_ENDL;
+		return rate;
+	}
+	else
+	{
+		return 1;
+	}
+}
+
+void camera_spin_around_ccw( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setOrbitLeftKey( get_orbit_rate() );
+}
+
+
+void camera_spin_around_cw( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setOrbitRightKey( get_orbit_rate() );
+}
+
+void camera_spin_around_ccw_sitting( EKeystate s )
+{
+	if( KEYSTATE_UP == s && gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_SLIDERIGHT ) return;
+	if (gAgent.rotateGrabbed() || gAgentCamera.sitCameraEnabled() || gAgent.getRunning())
+	{
+		//send keystrokes, but do not change camera
+		agent_turn_right(s);
+	}
+	else
+	{
+		//change camera but do not send keystrokes
+		gAgentCamera.unlockView();
+		gAgentCamera.setOrbitLeftKey( get_orbit_rate() );
+	}
+}
+
+
+void camera_spin_around_cw_sitting( EKeystate s )
+{
+	if( KEYSTATE_UP == s && gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_SLIDELEFT ) return;
+	if (gAgent.rotateGrabbed() || gAgentCamera.sitCameraEnabled() || gAgent.getRunning())
+	{
+		//send keystrokes, but do not change camera
+		agent_turn_left(s);
+	}
+	else
+	{
+		//change camera but do not send keystrokes
+		gAgentCamera.unlockView();
+		gAgentCamera.setOrbitRightKey( get_orbit_rate() );
+	}
+}
+
+
+void camera_spin_over( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setOrbitUpKey( get_orbit_rate() );
+}
+
+
+void camera_spin_under( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setOrbitDownKey( get_orbit_rate() );
+}
+
+void camera_spin_over_sitting( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	if (gAgent.upGrabbed() || gAgentCamera.sitCameraEnabled())
+	{
+		//send keystrokes, but do not change camera
+		agent_jump(s);
+	}
+	else
+	{
+		//change camera but do not send keystrokes
+		gAgentCamera.setOrbitUpKey( get_orbit_rate() );
+	}
+}
+
+
+void camera_spin_under_sitting( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	if (gAgent.downGrabbed() || gAgentCamera.sitCameraEnabled())
+	{
+		//send keystrokes, but do not change camera
+		agent_push_down(s);
+	}
+	else
+	{
+		//change camera but do not send keystrokes
+		gAgentCamera.setOrbitDownKey( get_orbit_rate() );
+	}
+}
+
+void camera_move_forward( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setOrbitInKey( get_orbit_rate() );
+}
+
+
+void camera_move_backward( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setOrbitOutKey( get_orbit_rate() );
+}
+
+void camera_move_forward_sitting( EKeystate s )
+{
+	if( KEYSTATE_UP == s && gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_FORWARD ) return;
+	if (gAgent.forwardGrabbed() || gAgentCamera.sitCameraEnabled() || (gAgent.getRunning() && !gAgent.getAlwaysRun()))
+	{
+		agent_push_forward(s);
+	}
+	else
+	{
+		gAgentCamera.setOrbitInKey( get_orbit_rate() );
+	}
+}
+
+
+void camera_move_backward_sitting( EKeystate s )
+{
+	if( KEYSTATE_UP == s && gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_BACKWARD ) return;
+
+	if (gAgent.backwardGrabbed() || gAgentCamera.sitCameraEnabled() || (gAgent.getRunning() && !gAgent.getAlwaysRun()))
+	{
+		agent_push_backward(s);
+	}
+	else
+	{
+		gAgentCamera.setOrbitOutKey( get_orbit_rate() );
+	}
+}
+
+void camera_pan_up( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setPanUpKey( get_orbit_rate() );
+}
+
+void camera_pan_down( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setPanDownKey( get_orbit_rate() );
+}
+
+void camera_pan_left( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setPanLeftKey( get_orbit_rate() );
+}
+
+void camera_pan_right( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setPanRightKey( get_orbit_rate() );
+}
+
+void camera_pan_in( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setPanInKey( get_orbit_rate() );
+}
+
+void camera_pan_out( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setPanOutKey( get_orbit_rate() );
+}
+
+void camera_move_forward_fast( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setOrbitInKey(2.5f);
+}
+
+void camera_move_backward_fast( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gAgentCamera.unlockView();
+	gAgentCamera.setOrbitOutKey(2.5f);
+}
+
+
+void edit_avatar_spin_ccw( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gMorphView->setCameraDrivenByKeys( TRUE );
+	gAgentCamera.setOrbitLeftKey( get_orbit_rate() );
+	//gMorphView->orbitLeft( get_orbit_rate() );
+}
+
+
+void edit_avatar_spin_cw( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gMorphView->setCameraDrivenByKeys( TRUE );
+	gAgentCamera.setOrbitRightKey( get_orbit_rate() );
+	//gMorphView->orbitRight( get_orbit_rate() );
+}
+
+void edit_avatar_spin_over( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gMorphView->setCameraDrivenByKeys( TRUE );
+	gAgentCamera.setOrbitUpKey( get_orbit_rate() );
+	//gMorphView->orbitUp( get_orbit_rate() );
+}
+
+
+void edit_avatar_spin_under( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gMorphView->setCameraDrivenByKeys( TRUE );
+	gAgentCamera.setOrbitDownKey( get_orbit_rate() );
+	//gMorphView->orbitDown( get_orbit_rate() );
+}
+
+void edit_avatar_move_forward( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gMorphView->setCameraDrivenByKeys( TRUE );
+	gAgentCamera.setOrbitInKey( get_orbit_rate() );
+	//gMorphView->orbitIn();
+}
+
+
+void edit_avatar_move_backward( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	gMorphView->setCameraDrivenByKeys( TRUE );
+	gAgentCamera.setOrbitOutKey( get_orbit_rate() );
+	//gMorphView->orbitOut();
+}
+
+void stop_moving( EKeystate s )
+{
+	if( KEYSTATE_UP == s  ) return;
+	// stop agent
+	gAgent.setControlFlags(AGENT_CONTROL_STOP);
+
+	// cancel autopilot
+	gAgent.stopAutoPilot();
+}
+
+void start_chat( EKeystate s )
+{
+    if (LLAppViewer::instance()->quitRequested())
+    {
+        return; // can't talk, gotta go, kthxbye!
+    }
+    
+	// start chat
+	LLFloaterIMNearbyChat::startChat(NULL);
+}
+
+void start_gesture( EKeystate s )
+{
+	LLUICtrl* focus_ctrlp = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
+	if (KEYSTATE_UP == s &&
+		! (focus_ctrlp && focus_ctrlp->acceptsTextInput()))
+	{
+ 		if ((LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->getCurrentChat().empty())
+ 		{
+ 			// No existing chat in chat editor, insert '/'
+ 			LLFloaterIMNearbyChat::startChat("/");
+ 		}
+ 		else
+ 		{
+ 			// Don't overwrite existing text in chat editor
+ 			LLFloaterIMNearbyChat::startChat(NULL);
+ 		}
+	}
+}
+
+#define REGISTER_KEYBOARD_ACTION(KEY, ACTION) LLREGISTER_STATIC(LLKeyboardActionRegistry, KEY, ACTION);
+REGISTER_KEYBOARD_ACTION("jump", agent_jump);
+REGISTER_KEYBOARD_ACTION("push_down", agent_push_down);
+REGISTER_KEYBOARD_ACTION("push_forward", agent_push_forward);
+REGISTER_KEYBOARD_ACTION("push_backward", agent_push_backward);
+REGISTER_KEYBOARD_ACTION("look_up", agent_look_up);
+REGISTER_KEYBOARD_ACTION("look_down", agent_look_down);
+REGISTER_KEYBOARD_ACTION("toggle_fly", agent_toggle_fly);
+REGISTER_KEYBOARD_ACTION("turn_left", agent_turn_left);
+REGISTER_KEYBOARD_ACTION("turn_right", agent_turn_right);
+REGISTER_KEYBOARD_ACTION("slide_left", agent_slide_left);
+REGISTER_KEYBOARD_ACTION("slide_right", agent_slide_right);
+REGISTER_KEYBOARD_ACTION("spin_around_ccw", camera_spin_around_ccw);
+REGISTER_KEYBOARD_ACTION("spin_around_cw", camera_spin_around_cw);
+REGISTER_KEYBOARD_ACTION("spin_around_ccw_sitting", camera_spin_around_ccw_sitting);
+REGISTER_KEYBOARD_ACTION("spin_around_cw_sitting", camera_spin_around_cw_sitting);
+REGISTER_KEYBOARD_ACTION("spin_over", camera_spin_over);
+REGISTER_KEYBOARD_ACTION("spin_under", camera_spin_under);
+REGISTER_KEYBOARD_ACTION("spin_over_sitting", camera_spin_over_sitting);
+REGISTER_KEYBOARD_ACTION("spin_under_sitting", camera_spin_under_sitting);
+REGISTER_KEYBOARD_ACTION("move_forward", camera_move_forward);
+REGISTER_KEYBOARD_ACTION("move_backward", camera_move_backward);
+REGISTER_KEYBOARD_ACTION("move_forward_sitting", camera_move_forward_sitting);
+REGISTER_KEYBOARD_ACTION("move_backward_sitting", camera_move_backward_sitting);
+REGISTER_KEYBOARD_ACTION("pan_up", camera_pan_up);
+REGISTER_KEYBOARD_ACTION("pan_down", camera_pan_down);
+REGISTER_KEYBOARD_ACTION("pan_left", camera_pan_left);
+REGISTER_KEYBOARD_ACTION("pan_right", camera_pan_right);
+REGISTER_KEYBOARD_ACTION("pan_in", camera_pan_in);
+REGISTER_KEYBOARD_ACTION("pan_out", camera_pan_out);
+REGISTER_KEYBOARD_ACTION("move_forward_fast", camera_move_forward_fast);
+REGISTER_KEYBOARD_ACTION("move_backward_fast", camera_move_backward_fast);
+REGISTER_KEYBOARD_ACTION("edit_avatar_spin_ccw", edit_avatar_spin_ccw);
+REGISTER_KEYBOARD_ACTION("edit_avatar_spin_cw", edit_avatar_spin_cw);
+REGISTER_KEYBOARD_ACTION("edit_avatar_spin_over", edit_avatar_spin_over);
+REGISTER_KEYBOARD_ACTION("edit_avatar_spin_under", edit_avatar_spin_under);
+REGISTER_KEYBOARD_ACTION("edit_avatar_move_forward", edit_avatar_move_forward);
+REGISTER_KEYBOARD_ACTION("edit_avatar_move_backward", edit_avatar_move_backward);
+REGISTER_KEYBOARD_ACTION("stop_moving", stop_moving);
+REGISTER_KEYBOARD_ACTION("start_chat", start_chat);
+REGISTER_KEYBOARD_ACTION("start_gesture", start_gesture);
+#undef REGISTER_KEYBOARD_ACTION
+
+LLViewerKeyboard::LLViewerKeyboard()
+{
+	for (S32 i = 0; i < MODE_COUNT; i++)
+	{
+		mBindingCount[i] = 0;
+	}
+
+	for (S32 i = 0; i < KEY_COUNT; i++)
+	{
+		mKeyHandledByUI[i] = FALSE;
+	}
+	// we want the UI to never see these keys so that they can always control the avatar/camera
+	for(KEY k = KEY_PAD_UP; k <= KEY_PAD_DIVIDE; k++) 
+	{
+		mKeysSkippedByUI.insert(k);	
+	}
+}
+
+BOOL LLViewerKeyboard::modeFromString(const std::string& string, S32 *mode)
+{
+	if (string == "FIRST_PERSON")
+	{
+		*mode = MODE_FIRST_PERSON;
+		return TRUE;
+	}
+	else if (string == "THIRD_PERSON")
+	{
+		*mode = MODE_THIRD_PERSON;
+		return TRUE;
+	}
+	else if (string == "EDIT")
+	{
+		*mode = MODE_EDIT;
+		return TRUE;
+	}
+	else if (string == "EDIT_AVATAR")
+	{
+		*mode = MODE_EDIT_AVATAR;
+		return TRUE;
+	}
+	else if (string == "SITTING")
+	{
+		*mode = MODE_SITTING;
+		return TRUE;
+	}
+	else
+	{
+		*mode = MODE_THIRD_PERSON;
+		return FALSE;
+	}
+}
+
+BOOL LLViewerKeyboard::handleKey(KEY translated_key,  MASK translated_mask, BOOL repeated)
+{
+	// check for re-map
+	EKeyboardMode mode = gViewerKeyboard.getMode();
+	U32 keyidx = (translated_mask<<16) | translated_key;
+	key_remap_t::iterator iter = mRemapKeys[mode].find(keyidx);
+	if (iter != mRemapKeys[mode].end())
+	{
+		translated_key = (iter->second) & 0xff;
+		translated_mask = (iter->second)>>16;
+	}
+
+	// No repeats of F-keys
+	BOOL repeatable_key = (translated_key < KEY_F1 || translated_key > KEY_F12);
+	if (!repeatable_key && repeated)
+	{
+		return FALSE;
+	}
+
+	LL_DEBUGS("UserInput") << "keydown -" << translated_key << "-" << LL_ENDL;
+	// skip skipped keys
+	if(mKeysSkippedByUI.find(translated_key) != mKeysSkippedByUI.end()) 
+	{
+		mKeyHandledByUI[translated_key] = FALSE;
+		LL_INFOS("KeyboardHandling") << "Key wasn't handled by UI!" << LL_ENDL;
+	}
+	else
+	{
+		// it is sufficient to set this value once per call to handlekey
+		// without clearing it, as it is only used in the subsequent call to scanKey
+		mKeyHandledByUI[translated_key] = gViewerWindow->handleKey(translated_key, translated_mask); 
+		// mKeyHandledByUI is not what you think ... this indicates whether the UI has handled this keypress yet (any keypress)
+		// NOT whether some UI shortcut wishes to handle the keypress
+	  
+	}
+	return mKeyHandledByUI[translated_key];
+}
+
+BOOL LLViewerKeyboard::handleKeyUp(KEY translated_key, MASK translated_mask)
+{
+	return gViewerWindow->handleKeyUp(translated_key, translated_mask);
+}
+
+BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, const std::string& function_name)
+{
+	S32 index;
+	typedef boost::function<void(EKeystate)> function_t;
+	function_t function = NULL;
+	std::string name;
+
+	// Allow remapping of F2-F12
+	if (function_name[0] == 'F')
+	{
+		int c1 = function_name[1] - '0';
+		int c2 = function_name[2] ? function_name[2] - '0' : -1;
+		if (c1 >= 0 && c1 <= 9 && c2 >= -1 && c2 <= 9)
+		{
+			int idx = c1;
+			if (c2 >= 0)
+				idx = idx*10 + c2;
+			if (idx >=2 && idx <= 12)
+			{
+				U32 keyidx = ((mask<<16)|key);
+				(mRemapKeys[mode])[keyidx] = ((0<<16)|(KEY_F1+(idx-1)));
+				return TRUE;
+			}
+		}
+	}
+
+	// Not remapped, look for a function
+	
+	function_t* result = LLKeyboardActionRegistry::getValue(function_name);
+	if (result)
+	{
+		function = *result;
+	}
+
+	if (!function)
+	{
+		LL_ERRS() << "Can't bind key to function " << function_name << ", no function with this name found" << LL_ENDL;
+		return FALSE;
+	}
+
+	// check for duplicate first and overwrite
+	for (index = 0; index < mBindingCount[mode]; index++)
+	{
+		if (key == mBindings[mode][index].mKey && mask == mBindings[mode][index].mMask)
+			break;
+	}
+
+	if (index >= MAX_KEY_BINDINGS)
+	{
+		LL_ERRS() << "LLKeyboard::bindKey() - too many keys for mode " << mode << LL_ENDL;
+		return FALSE;
+	}
+
+	if (mode >= MODE_COUNT)
+	{
+		LL_ERRS() << "LLKeyboard::bindKey() - unknown mode passed" << mode << LL_ENDL;
+		return FALSE;
+	}
+
+	mBindings[mode][index].mKey = key;
+	mBindings[mode][index].mMask = mask;
+	mBindings[mode][index].mFunction = function;
+
+	if (index == mBindingCount[mode])
+		mBindingCount[mode]++;
+
+	return TRUE;
+}
+
+LLViewerKeyboard::KeyBinding::KeyBinding()
+:	key("key"),
+	mask("mask"),
+	command("command")
+{}
+
+LLViewerKeyboard::KeyMode::KeyMode(EKeyboardMode _mode)
+:	bindings("binding"),
+	mode(_mode)
+{}
+
+LLViewerKeyboard::Keys::Keys()
+:	first_person("first_person", KeyMode(MODE_FIRST_PERSON)),
+	third_person("third_person", KeyMode(MODE_THIRD_PERSON)),
+	edit("edit", KeyMode(MODE_EDIT)),
+	sitting("sitting", KeyMode(MODE_SITTING)),
+	edit_avatar("edit_avatar", KeyMode(MODE_EDIT_AVATAR))
+{}
+
+S32 LLViewerKeyboard::loadBindingsXML(const std::string& filename)
+{
+	S32 binding_count = 0;
+	Keys keys;
+	LLSimpleXUIParser parser;
+
+	if (parser.readXUI(filename, keys) 
+		&& keys.validateBlock())
+	{
+		binding_count += loadBindingMode(keys.first_person);
+		binding_count += loadBindingMode(keys.third_person);
+		binding_count += loadBindingMode(keys.edit);
+		binding_count += loadBindingMode(keys.sitting);
+		binding_count += loadBindingMode(keys.edit_avatar);
+	}
+	return binding_count;
+}
+
+S32 LLViewerKeyboard::loadBindingMode(const LLViewerKeyboard::KeyMode& keymode)
+{
+	S32 binding_count = 0;
+	for (LLInitParam::ParamIterator<KeyBinding>::const_iterator it = keymode.bindings.begin(), 
+			end_it = keymode.bindings.end();
+		it != end_it;
+		++it)
+	{
+		KEY key;
+		MASK mask;
+		LLKeyboard::keyFromString(it->key, &key);
+		LLKeyboard::maskFromString(it->mask, &mask);
+		bindKey(keymode.mode, key, mask, it->command);
+		binding_count++;
+	}
+
+	return binding_count;
+}
+
+S32 LLViewerKeyboard::loadBindings(const std::string& filename)
+{
+	LLFILE *fp;
+	const S32 BUFFER_SIZE = 2048;
+	char buffer[BUFFER_SIZE];	/* Flawfinder: ignore */
+	// *NOTE: This buffer size is hard coded into scanf() below.
+	char mode_string[MAX_STRING] = "";	/* Flawfinder: ignore */
+	char key_string[MAX_STRING] = "";	/* Flawfinder: ignore */
+	char mask_string[MAX_STRING] = "";	/* Flawfinder: ignore */
+	char function_string[MAX_STRING] = "";	/* Flawfinder: ignore */
+	S32 mode = MODE_THIRD_PERSON;
+	KEY key = 0;
+	MASK mask = 0;
+	S32 tokens_read;
+	S32 binding_count = 0;
+	S32 line_count = 0;
+
+	if(filename.empty())
+	{
+		LL_ERRS() << " No filename specified" << LL_ENDL;
+		return 0;
+	}
+
+	fp = LLFile::fopen(filename, "r");
+
+	if (!fp)
+	{
+		return 0;
+	}
+
+
+	while (!feof(fp))
+	{
+		line_count++;
+		if (!fgets(buffer, BUFFER_SIZE, fp))
+			break;
+
+		// skip over comments, blank lines
+		if (buffer[0] == '#' || buffer[0] == '\n') continue;
+
+		// grab the binding strings
+		tokens_read = sscanf(	/* Flawfinder: ignore */
+			buffer,
+			"%254s %254s %254s %254s",
+			mode_string,
+			key_string,
+			mask_string,
+			function_string);
+
+		if (tokens_read == EOF)
+		{
+			LL_INFOS() << "Unexpected end-of-file at line " << line_count << " of key binding file " << filename << LL_ENDL;
+			fclose(fp);
+			return 0;
+		}
+		else if (tokens_read < 4)
+		{
+			LL_INFOS() << "Can't read line " << line_count << " of key binding file " << filename << LL_ENDL;
+			continue;
+		}
+
+		// convert mode
+		if (!modeFromString(mode_string, &mode))
+		{
+			LL_INFOS() << "Unknown mode on line " << line_count << " of key binding file " << filename << LL_ENDL;
+			LL_INFOS() << "Mode must be one of FIRST_PERSON, THIRD_PERSON, EDIT, EDIT_AVATAR" << LL_ENDL;
+			continue;
+		}
+
+		// convert key
+		if (!LLKeyboard::keyFromString(key_string, &key))
+		{
+			LL_INFOS() << "Can't interpret key on line " << line_count << " of key binding file " << filename << LL_ENDL;
+			continue;
+		}
+
+		// convert mask
+		if (!LLKeyboard::maskFromString(mask_string, &mask))
+		{
+			LL_INFOS() << "Can't interpret mask on line " << line_count << " of key binding file " << filename << LL_ENDL;
+			continue;
+		}
+
+		// bind key
+		if (bindKey(mode, key, mask, function_string))
+		{
+			binding_count++;
+		}
+	}
+
+	fclose(fp);
+
+	return binding_count;
+}
+
+
+EKeyboardMode LLViewerKeyboard::getMode()
+{
+	if ( gAgentCamera.cameraMouselook() )
+	{
+		return MODE_FIRST_PERSON;
+	}
+	else if ( gMorphView && gMorphView->getVisible())
+	{
+		return MODE_EDIT_AVATAR;
+	}
+	else if (isAgentAvatarValid() && gAgentAvatarp->isSitting())
+	{
+		return MODE_SITTING;
+	}
+	else
+	{
+		return MODE_THIRD_PERSON;
+	}
+}
+
+
+// Called from scanKeyboard.
+void LLViewerKeyboard::scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level)
+{
+	if (LLApp::isExiting())
+	{
+		return;
+	}
+
+	S32 mode = getMode();
+	// Consider keyboard scanning as NOT mouse event. JC
+	MASK mask = gKeyboard->currentMask(FALSE);
+
+	LLKeyBinding* binding = mBindings[mode];
+	S32 binding_count = mBindingCount[mode];
+
+
+	if (mKeyHandledByUI[key])
+	{
+		return;
+	}
+
+	// don't process key down on repeated keys
+	BOOL repeat = gKeyboard->getKeyRepeated(key);
+
+	for (S32 i = 0; i < binding_count; i++)
+	{
+		//for (S32 key = 0; key < KEY_COUNT; key++)
+		if (binding[i].mKey == key)
+		{
+			//if (binding[i].mKey == key && binding[i].mMask == mask)
+			if (binding[i].mMask == mask)
+			{
+				if (key_down && !repeat)
+				{
+					// ...key went down this frame, call function
+					binding[i].mFunction( KEYSTATE_DOWN );
+				}
+				else if (key_up)
+				{
+					// ...key went down this frame, call function
+					binding[i].mFunction( KEYSTATE_UP );
+				}
+				else if (key_level)
+				{
+					// ...key held down from previous frame
+					// Not windows, just call the function.
+					binding[i].mFunction( KEYSTATE_LEVEL );
+				}//if
+			}//if
+		}//for
+	}//for
+}
diff --git a/indra/newview/llviewerkeyboard.h b/indra/newview/llviewerkeyboard.h
new file mode 100644
index 0000000000..110dc89d28
--- /dev/null
+++ b/indra/newview/llviewerkeyboard.h
@@ -0,0 +1,118 @@
+/** 
+ * @file llviewerkeyboard.h
+ * @brief LLViewerKeyboard class header file
+ *
+ * $LicenseInfo:firstyear=2005&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLVIEWERKEYBOARD_H
+#define LL_LLVIEWERKEYBOARD_H
+
+#include "llkeyboard.h" // For EKeystate
+#include "llinitparam.h"
+
+const S32 MAX_NAMED_FUNCTIONS = 100;
+const S32 MAX_KEY_BINDINGS = 128; // was 60
+
+class LLNamedFunction
+{
+public:
+	LLNamedFunction() : mFunction(NULL) { };
+	~LLNamedFunction() { };
+
+	std::string	mName;
+	LLKeyFunc	mFunction;
+};
+
+typedef enum e_keyboard_mode
+{
+	MODE_FIRST_PERSON,
+	MODE_THIRD_PERSON,
+	MODE_EDIT,
+	MODE_EDIT_AVATAR,
+	MODE_SITTING,
+	MODE_COUNT
+} EKeyboardMode;
+
+
+void bind_keyboard_functions();
+
+class LLViewerKeyboard
+{
+public:
+	struct KeyBinding : public LLInitParam::Block<KeyBinding>
+	{
+		Mandatory<std::string>	key,
+								mask,
+								command;
+
+		KeyBinding();
+	};
+
+	struct KeyMode : public LLInitParam::Block<KeyMode>
+	{
+		Multiple<KeyBinding>		bindings;
+		EKeyboardMode				mode;
+		KeyMode(EKeyboardMode mode);
+	};
+
+	struct Keys : public LLInitParam::Block<Keys>
+	{
+		Optional<KeyMode>	first_person,
+							third_person,
+							edit,
+							sitting,
+							edit_avatar;
+
+		Keys();
+	};
+
+	LLViewerKeyboard();
+
+	BOOL			handleKey(KEY key, MASK mask, BOOL repeated);
+	BOOL			handleKeyUp(KEY key, MASK mask);
+
+	S32				loadBindings(const std::string& filename);										// returns number bound, 0 on error
+	S32				loadBindingsXML(const std::string& filename);										// returns number bound, 0 on error
+	EKeyboardMode	getMode();
+
+	BOOL			modeFromString(const std::string& string, S32 *mode);			// False on failure
+
+	void			scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level);
+
+private:
+	S32				loadBindingMode(const LLViewerKeyboard::KeyMode& keymode);
+	BOOL			bindKey(const S32 mode, const KEY key, const MASK mask, const std::string& function_name);
+
+	// Hold all the ugly stuff torn out to make LLKeyboard non-viewer-specific here
+	S32				mBindingCount[MODE_COUNT];
+	LLKeyBinding	mBindings[MODE_COUNT][MAX_KEY_BINDINGS];
+
+	typedef std::map<U32, U32> key_remap_t;
+	key_remap_t		mRemapKeys[MODE_COUNT];
+	std::set<KEY>	mKeysSkippedByUI;
+	BOOL			mKeyHandledByUI[KEY_COUNT];		// key processed successfully by UI
+};
+
+extern LLViewerKeyboard gViewerKeyboard;
+
+#endif // LL_LLVIEWERKEYBOARD_H
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 700462ad75..79081f3e02 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2294,6 +2294,18 @@ void LLViewerMediaImpl::mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::scrollWheel(const LLVector2& texture_coords, S32 scroll_x, S32 scroll_y, MASK mask)
+{
+    if (mMediaSource)
+    {
+        S32 x, y;
+        scaleTextureCoords(texture_coords, &x, &y);
+
+        scrollWheel(x, y, scroll_x, scroll_y, mask);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
 void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask)
 {
 	scaleMouse(&x, &y);
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index a5cde35c88..8bf1ad2441 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -235,6 +235,7 @@ public:
 	void mouseMove(const LLVector2& texture_coords, MASK mask);
     void mouseDoubleClick(const LLVector2& texture_coords, MASK mask);
     void mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button = 0);
+	void scrollWheel(const LLVector2& texture_coords, S32 scroll_x, S32 scroll_y, MASK mask);
 	void scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask);
 	void mouseCapture();
 	
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index 76eb61bedf..10099eda5b 100644
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -373,13 +373,26 @@ BOOL LLViewerMediaFocus::handleUnicodeChar(llwchar uni_char, BOOL called_from_pa
 		media_impl->handleUnicodeCharHere(uni_char);
 	return true;
 }
-BOOL LLViewerMediaFocus::handleScrollWheel(S32 x, S32 y, S32 clicks)
+
+BOOL LLViewerMediaFocus::handleScrollWheel(const LLVector2& texture_coords, S32 clicks_x, S32 clicks_y)
+{
+    BOOL retval = FALSE;
+    LLViewerMediaImpl* media_impl = getFocusedMediaImpl();
+    if (media_impl && media_impl->hasMedia())
+    {
+        media_impl->scrollWheel(texture_coords, clicks_x, clicks_y, gKeyboard->currentMask(TRUE));
+        retval = TRUE;
+    }
+    return retval;
+}
+
+BOOL LLViewerMediaFocus::handleScrollWheel(S32 x, S32 y, S32 clicks_x, S32 clicks_y)
 {
 	BOOL retval = FALSE;
 	LLViewerMediaImpl* media_impl = getFocusedMediaImpl();
 	if(media_impl && media_impl->hasMedia())
 	{
-		media_impl->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE));
+		media_impl->scrollWheel(x, y, clicks_x, clicks_y, gKeyboard->currentMask(TRUE));
 		retval = TRUE;
 	}
 	return retval;
diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h
index d26b35378b..effd08a559 100644
--- a/indra/newview/llviewermediafocus.h
+++ b/indra/newview/llviewermediafocus.h
@@ -58,7 +58,8 @@ public:
 	/*virtual*/ BOOL	handleKey(KEY key, MASK mask, BOOL called_from_parent);
 	/*virtual*/ BOOL	handleKeyUp(KEY key, MASK mask, BOOL called_from_parent);
 	/*virtual*/ BOOL	handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
-	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
+	BOOL handleScrollWheel(const LLVector2& texture_coords, S32 clicks_x, S32 clicks_y);
+	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks_x, S32 clicks_y);
 
 	void update();
 	
@@ -67,7 +68,8 @@ public:
 
 	bool isFocusedOnFace(LLPointer<LLViewerObject> objectp, S32 face);
 	bool isHoveringOverFace(LLPointer<LLViewerObject> objectp, S32 face);
-	
+	bool isHoveringOverFocused() { return mFocusedObjectID == mHoverObjectID && mFocusedObjectFace == mHoverObjectFace; };
+
 	// These look up (by uuid) and return the values that were set with setFocusFace.  They will return null if the objects have been destroyed.
 	LLViewerMediaImpl* getFocusedMediaImpl();
 	LLViewerObject* getFocusedObject();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ab054fabde..b6c7be2ed3 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8031,6 +8031,7 @@ BOOL LLViewerMenuHolderGL::hideMenus()
 	
 	if (LLMenuHolderGL::hideMenus())
 	{
+		LLToolPie::instance().blockClickToWalk();
 		handled = TRUE;
 	}
 
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index fefdeabdab..5a8110cd57 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -103,6 +103,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 			if(mMediaImpl.isNull())
 
 			{
+				play(parcel);
 				return;
 			}
 
@@ -159,6 +160,12 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
 	if (!gSavedSettings.getBOOL("AudioStreamingMedia"))
 		return;
 
+	// This test appears all over the code and really should be facotred out into a single 
+	// call that returns true/false (with option ask dialog) but that is outside of scope
+	// for this work so we'll just directly.
+	if (gSavedSettings.getS32("ParcelMediaAutoPlayEnable") == 0 )
+		return;
+
 	std::string media_url = parcel->getMediaURL();
 	std::string media_current_url = parcel->getMediaCurrentURL();
 	std::string mime_type = parcel->getMediaType();
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 6ddd661b2a..1e72e2266b 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -45,8 +45,7 @@
 #include "llmeshrepository.h"
 #include "llnotificationhandler.h"
 #include "llpanellogin.h"
-#include "llsetkeybinddialog.h"
-#include "llviewerinput.h"
+#include "llviewerkeyboard.h"
 #include "llviewermenu.h"
 
 #include "llviewquery.h"
@@ -174,7 +173,7 @@
 #include "llviewergesture.h"
 #include "llviewertexturelist.h"
 #include "llviewerinventory.h"
-#include "llviewerinput.h"
+#include "llviewerkeyboard.h"
 #include "llviewermedia.h"
 #include "llviewermediafocus.h"
 #include "llviewermenu.h"
@@ -915,18 +914,7 @@ LLViewerWindow::Params::Params()
 {}
 
 
-void LLViewerWindow::handlePieMenu(S32 x, S32 y, MASK mask)
-{
-    if (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgentCamera.getCameraMode() && LLToolMgr::getInstance()->getCurrentTool() != LLToolPie::getInstance() && gAgent.isInitialized())
-    {
-        // If the current tool didn't process the click, we should show
-        // the pie menu.  This can be done by passing the event to the pie
-        // menu tool.
-        LLToolPie::getInstance()->handleRightMouseDown(x, y, mask);
-    }
-}
-
-BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down)
+BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down)
 {
 	const char* buttonname = "";
 	const char* buttonstatestr = "";
@@ -950,30 +938,28 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK m
 		
 		switch (clicktype)
 		{
-		case CLICK_LEFT:
+		case LLMouseHandler::CLICK_LEFT:
 			mLeftMouseDown = down;
 			buttonname = "Left";
 			break;
-		case CLICK_RIGHT:
+		case LLMouseHandler::CLICK_RIGHT:
 			mRightMouseDown = down;
 			buttonname = "Right";
 			break;
-		case CLICK_MIDDLE:
+		case LLMouseHandler::CLICK_MIDDLE:
 			mMiddleMouseDown = down;
 			buttonname = "Middle";
 			break;
-		case CLICK_DOUBLELEFT:
+		case LLMouseHandler::CLICK_DOUBLELEFT:
 			mLeftMouseDown = down;
 			buttonname = "Left Double Click";
 			break;
-		case CLICK_BUTTON4:
+		case LLMouseHandler::CLICK_BUTTON4:
 			buttonname = "Button 4";
 			break;
-		case CLICK_BUTTON5:
+		case LLMouseHandler::CLICK_BUTTON5:
 			buttonname = "Button 5";
 			break;
-		default:
-			break; // COUNT and NONE
 		}
 		
 		LLView::sMouseHandlerMessage.clear();
@@ -1024,11 +1010,6 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK m
 				LLViewerEventRecorder::instance().logMouseEvent(std::string(buttonstatestr),std::string(buttonname)); 
 
 			}
-			else if (down && clicktype == CLICK_RIGHT)
-			{
-				handlePieMenu(x, y, mask);
-				r = TRUE;
-			}
 			return r;
 		}
 
@@ -1075,12 +1056,7 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK m
 		return TRUE;
 	}
 
-	if (down && clicktype == CLICK_RIGHT)
-	{
-		handlePieMenu(x, y, mask);
-		return TRUE;
-	}
-
+	
 	// If we got this far on a down-click, it wasn't handled.
 	// Up-clicks, though, are always handled as far as the OS is concerned.
 	BOOL default_rtn = !down;
@@ -1099,8 +1075,7 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
         mMouseDownTimer.reset();
     }    
     BOOL down = TRUE;
-    //handleMouse() loops back to LLViewerWindow::handleAnyMouseClick
-    return gViewerInput.handleMouse(window, pos, mask, CLICK_LEFT, down);
+	return handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_LEFT,down);
 }
 
 BOOL LLViewerWindow::handleDoubleClick(LLWindow *window,  LLCoordGL pos, MASK mask)
@@ -1108,7 +1083,8 @@ BOOL LLViewerWindow::handleDoubleClick(LLWindow *window,  LLCoordGL pos, MASK ma
 	// try handling as a double-click first, then a single-click if that
 	// wasn't handled.
 	BOOL down = TRUE;
-	if (gViewerInput.handleMouse(window, pos, mask, CLICK_DOUBLELEFT, down))
+	if (handleAnyMouseClick(window, pos, mask,
+				LLMouseHandler::CLICK_DOUBLELEFT, down))
 	{
 		return TRUE;
 	}
@@ -1122,24 +1098,47 @@ BOOL LLViewerWindow::handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask)
         mMouseDownTimer.stop();
     }
     BOOL down = FALSE;
-    return gViewerInput.handleMouse(window, pos, mask, CLICK_LEFT, down);
+	return handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_LEFT,down);
 }
+
+
 BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask)
 {
+	S32 x = pos.mX;
+	S32 y = pos.mY;
+	x = ll_round((F32)x / mDisplayScale.mV[VX]);
+	y = ll_round((F32)y / mDisplayScale.mV[VY]);
+
 	BOOL down = TRUE;
-	return gViewerInput.handleMouse(window, pos, mask, CLICK_RIGHT, down);
+	BOOL handle = handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_RIGHT,down);
+	if (handle)
+		return handle;
+
+	// *HACK: this should be rolled into the composite tool logic, not
+	// hardcoded at the top level.
+	if (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgentCamera.getCameraMode() && LLToolMgr::getInstance()->getCurrentTool() != LLToolPie::getInstance() && gAgent.isInitialized())
+	{
+		// If the current tool didn't process the click, we should show
+		// the pie menu.  This can be done by passing the event to the pie
+		// menu tool.
+		LLToolPie::getInstance()->handleRightMouseDown(x, y, mask);
+		// show_context_menu( x, y, mask );
+	}
+
+	return TRUE;
 }
 
 BOOL LLViewerWindow::handleRightMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask)
 {
 	BOOL down = FALSE;
- 	return gViewerInput.handleMouse(window, pos, mask, CLICK_RIGHT, down);
+ 	return handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_RIGHT,down);
 }
 
 BOOL LLViewerWindow::handleMiddleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask)
 {
 	BOOL down = TRUE;
- 	gViewerInput.handleMouse(window, pos, mask, CLICK_MIDDLE, down);
+	LLVoiceClient::getInstance()->updateMouseState(LLMouseHandler::CLICK_MIDDLE, true);
+ 	handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_MIDDLE,down);
   
   	// Always handled as far as the OS is concerned.
 	return TRUE;
@@ -1294,7 +1293,8 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi
 BOOL LLViewerWindow::handleMiddleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask)
 {
 	BOOL down = FALSE;
- 	gViewerInput.handleMouse(window, pos, mask, CLICK_MIDDLE, down);
+	LLVoiceClient::getInstance()->updateMouseState(LLMouseHandler::CLICK_MIDDLE, false);
+ 	handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_MIDDLE,down);
   
   	// Always handled as far as the OS is concerned.
 	return TRUE;
@@ -1305,10 +1305,12 @@ BOOL LLViewerWindow::handleOtherMouse(LLWindow *window, LLCoordGL pos, MASK mask
     switch (button)
     {
     case 4:
-        gViewerInput.handleMouse(window, pos, mask, CLICK_BUTTON4, down);
+        LLVoiceClient::getInstance()->updateMouseState(LLMouseHandler::CLICK_BUTTON4, down);
+        handleAnyMouseClick(window, pos, mask, LLMouseHandler::CLICK_BUTTON4, down);
         break;
     case 5:
-        gViewerInput.handleMouse(window, pos, mask, CLICK_BUTTON5, down);
+        LLVoiceClient::getInstance()->updateMouseState(LLMouseHandler::CLICK_BUTTON5, down);
+        handleAnyMouseClick(window, pos, mask, LLMouseHandler::CLICK_BUTTON5, down);
         break;
     default:
         break;
@@ -1455,6 +1457,9 @@ void LLViewerWindow::handleFocusLost(LLWindow *window)
 
 BOOL LLViewerWindow::handleTranslatedKeyDown(KEY key,  MASK mask, BOOL repeated)
 {
+	// Let the voice chat code check for its PTT key.  Note that this never affects event processing.
+	LLVoiceClient::getInstance()->keyDown(key, mask);
+
 	if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
 	{
 		gAgent.clearAFK();
@@ -1473,12 +1478,14 @@ BOOL LLViewerWindow::handleTranslatedKeyDown(KEY key,  MASK mask, BOOL repeated)
     		return FALSE;
 	}
 
-    // remaps, handles ignored cases and returns back to viewer window.
-    return gViewerInput.handleKey(key, mask, repeated);
+	return gViewerKeyboard.handleKey(key, mask, repeated);
 }
 
 BOOL LLViewerWindow::handleTranslatedKeyUp(KEY key,  MASK mask)
 {
+	// Let the voice chat code check for its PTT key.  Note that this never affects event processing.
+	LLVoiceClient::getInstance()->keyUp(key, mask);
+
 	// Let the inspect tool code check for ALT key to set LLToolSelectRect active instead LLToolCamera
 	LLToolCompInspect * tool_inspectp = LLToolCompInspect::getInstance();
 	if (LLToolMgr::getInstance()->getCurrentTool() == tool_inspectp)
@@ -1486,13 +1493,13 @@ BOOL LLViewerWindow::handleTranslatedKeyUp(KEY key,  MASK mask)
 		tool_inspectp->keyUp(key, mask);
 	}
 
-	return gViewerInput.handleKeyUp(key, mask);
+	return gViewerKeyboard.handleKeyUp(key, mask);
 }
 
 void LLViewerWindow::handleScanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level)
 {
 	LLViewerJoystick::getInstance()->setCameraNeedsUpdate(true);
-	gViewerInput.scanKey(key, key_down, key_up, key_level);
+	gViewerKeyboard.scanKey(key, key_down, key_up, key_level);
 	return; // Be clear this function returns nothing
 }
 
@@ -2732,14 +2739,6 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 	// hide tooltips on keypress
 	LLToolTipMgr::instance().blockToolTips();
 
-    // let menus handle navigation keys for navigation
-    if (LLSetKeyBindDialog::recordKey(key, mask))
-    {
-        LL_DEBUGS() << "Key handled by LLSetKeyBindDialog" << LL_ENDL;
-        LLViewerEventRecorder::instance().logKeyEvent(key,mask);
-        return TRUE;
-    }
-
     LLFocusableElement* keyboard_focus = gFocusMgr.getKeyboardFocus();
 
     if (keyboard_focus
@@ -2955,8 +2954,7 @@ BOOL LLViewerWindow::handleUnicodeChar(llwchar uni_char, MASK mask)
 	{
 		if (mask != MASK_ALT)
 		{
-			// remaps, handles ignored cases and returns back to viewer window.
-			return gViewerInput.handleKey(KEY_RETURN, mask, gKeyboard->getKeyRepeated(KEY_RETURN));
+			return gViewerKeyboard.handleKey(KEY_RETURN, mask, gKeyboard->getKeyRepeated(KEY_RETURN));
 		}
 	}
 
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index 67e5e4b4d6..e901245f92 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -175,9 +175,8 @@ public:
 	void			initWorldUI();
 	void			setUIVisibility(bool);
 	bool			getUIVisibility();
-	void			handlePieMenu(S32 x, S32 y, MASK mask);
 
-	BOOL handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down);
+	BOOL handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down);
 
 	//
 	// LLWindowCallback interface implementation
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index fca8de7410..cc590fc947 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -200,6 +200,8 @@ const LLVoiceVersionInfo LLVoiceClient::getVersion()
 void LLVoiceClient::updateSettings()
 {
 	setUsePTT(gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
+	std::string keyString = gSavedSettings.getString("PushToTalkButton");
+	setPTTKey(keyString);
 	setPTTIsToggle(gSavedSettings.getBOOL("PushToTalkToggle"));
 	mDisableMic = gSavedSettings.getBOOL("VoiceDisableMic");
 
@@ -635,6 +637,32 @@ bool LLVoiceClient::getPTTIsToggle()
 	return mPTTIsToggle;
 }
 
+void LLVoiceClient::setPTTKey(std::string &key)
+{
+	// Value is stored as text for readability
+	if(key == "MiddleMouse")
+	{
+		mPTTMouseButton = LLMouseHandler::CLICK_MIDDLE;
+	}
+	else if(key == "MouseButton4")
+	{
+		mPTTMouseButton = LLMouseHandler::CLICK_BUTTON4;
+	}
+	else if (key == "MouseButton5")
+	{
+		mPTTMouseButton = LLMouseHandler::CLICK_BUTTON5;
+	}
+	else
+	{
+		mPTTMouseButton = 0;
+		if(!LLKeyboard::keyFromString(key, &mPTTKey))
+		{
+			// If the call failed, don't match any key.
+			key = KEY_NONE;
+		}
+	}
+}
+
 void LLVoiceClient::inputUserControlState(bool down)
 {
 	if(mPTTIsToggle)
@@ -655,6 +683,43 @@ void LLVoiceClient::toggleUserPTTState(void)
 	setUserPTTState(!getUserPTTState());
 }
 
+void LLVoiceClient::keyDown(KEY key, MASK mask)
+{	
+	if (gKeyboard->getKeyRepeated(key))
+	{
+		// ignore auto-repeat keys                                                                         
+		return;
+	}
+	
+	if (mPTTMouseButton == 0 && LLAgent::isActionAllowed("speak") && (key == mPTTKey))
+	{
+		bool down = gKeyboard->getKeyDown(mPTTKey);
+		if (down)
+		{
+			inputUserControlState(down);
+		}
+	}
+	
+}
+void LLVoiceClient::keyUp(KEY key, MASK mask)
+{
+	if (mPTTMouseButton == 0 && (key == mPTTKey))
+	{
+		bool down = gKeyboard->getKeyDown(mPTTKey);
+		if (!down)
+		{
+			inputUserControlState(down);
+		}
+	}
+}
+void LLVoiceClient::updateMouseState(S32 click, bool down)
+{
+	if(mPTTMouseButton == click && LLAgent::isActionAllowed("speak"))
+	{
+		inputUserControlState(down);
+	}
+}
+
 
 //-------------------------------------------
 // nearby speaker accessors
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index cecaac7f85..3d04e1f0db 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -408,10 +408,16 @@ public:
 	void setUsePTT(bool usePTT);
 	void setPTTIsToggle(bool PTTIsToggle);
 	bool getPTTIsToggle();	
-
+	void setPTTKey(std::string &key);
+	
 	void updateMicMuteLogic();
-
+	
 	BOOL lipSyncEnabled();
+	
+	// PTT key triggering
+	void keyDown(KEY key, MASK mask);
+	void keyUp(KEY key, MASK mask);
+	void updateMouseState(S32 click, bool down);
 
 	boost::signals2::connection MicroChangedCallback(const micro_changed_signal_t::slot_type& cb ) { return mMicroChangedSignal.connect(cb); }
 
diff --git a/indra/newview/llwindowlistener.cpp b/indra/newview/llwindowlistener.cpp
index aa8c79b0d2..9e4297baaf 100644
--- a/indra/newview/llwindowlistener.cpp
+++ b/indra/newview/llwindowlistener.cpp
@@ -37,7 +37,7 @@
 #include "llview.h"
 #include "llviewinject.h"
 #include "llviewerwindow.h"
-#include "llviewerinput.h"
+#include "llviewerkeyboard.h"
 #include "llrootview.h"
 #include "llsdutil.h"
 #include "stringize.h"
@@ -279,7 +279,7 @@ void LLWindowListener::keyDown(LLSD const & evt)
 			response.setResponse(target_view->getInfo());
 			
 			gFocusMgr.setKeyboardFocus(target_view);
-			gViewerInput.handleKey(key, mask, false);
+			gViewerKeyboard.handleKey(key, mask, false);
 			if(key < 0x80) mWindow->handleUnicodeChar(key, mask);
 		}
 		else 
@@ -291,7 +291,7 @@ void LLWindowListener::keyDown(LLSD const & evt)
 	}
 	else 
 	{
-		gViewerInput.handleKey(key, mask, false); 
+		gViewerKeyboard.handleKey(key, mask, false); 
 		if(key < 0x80) mWindow->handleUnicodeChar(key, mask);
 	}
 }
diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
deleted file mode 100644
index 7b777befee..0000000000
--- a/indra/newview/skins/default/xui/en/control_table_contents.xml
+++ /dev/null
@@ -1,625 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<contents>
-    <columns
-     relative_width="0.34"
-     label="Action"
-     name="lst_action" />
-    <columns
-     relative_width="0.22"
-     label="Primary Control"
-     name="lst_ctrl1" />
-    <columns
-     relative_width="0.22"
-     label="Alternate 1"
-     name="lst_ctrl2" />
-    <columns
-     relative_width="0.22"
-     label="Alternate 2"
-     name="lst_ctrl3" />
-    <rows
-     enabled="false"
-     name="move_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Move Actions"
-         name="lst_action"
-         value="Move_Walk_Off" />
-    </rows>
-    <rows
-     name="walk_to"
-     value="walk_to">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Walk to location mouse cursor points to"
-         value="Walk to" />
-    </rows>
-    <rows
-     name="teleport_to"
-     value="teleport_to">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Teleport to location mouse cursor points to, but not all locations allow direct teleportation so you might be teleported closer to destination instead"
-         value="Teleport to" />
-    </rows>
-    <rows
-     name="push_forward"
-     value="push_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Move Forward" />
-    </rows>
-    <rows
-     name="push_backward"
-     value="push_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Move Backward" />
-    </rows>
-    <rows
-     name="turn_left"
-     value="turn_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Left" />
-    </rows>
-    <rows
-     name="turn_right"
-     value="turn_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Right" />
-    </rows>
-    <rows
-     name="slide_left"
-     value="slide_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Strafe left" />
-    </rows>
-    <rows
-     name="slide_right"
-     value="slide_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Strafe right" />
-    </rows>
-    <rows
-     name="jump"
-     value="jump">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Jump/Up" />
-    </rows>
-    <rows
-     name="push_down"
-     value="push_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Down" />
-    </rows>
-    <rows
-     name="run_forward"
-     value="run_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Forward" />
-    </rows>
-    <rows
-     name="run_backward"
-     value="run_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Backward" />
-    </rows>
-    <rows
-     name="run_left"
-     value="run_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Left" />
-    </rows>
-    <rows
-     name="run_right"
-     value="run_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Right" />
-    </rows>
-    <rows
-     name="toggle_run"
-     value="toggle_run">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Toggle Run" />
-    </rows>
-    <rows
-     name="toggle_fly"
-     value="toggle_fly">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Fly/Stop flying" />
-    </rows>
-    <rows
-     name="toggle_sit"
-     value="toggle_sit">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Sit/Stand" />
-    </rows>
-    <rows
-     name="stop_moving"
-     value="stop_moving">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Stop Moving" />
-    </rows>
-    <rows
-     enabled="false">
-        <columns
-         type="icon"
-         color="0 0 0 0.7"
-         halign="center"
-         value="menu_separator" />
-    </rows>
-    <rows
-     enabled="false"
-     name="camera_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Camera"
-         name="lst_action"
-         value="Cam_FreeCam_Off" />
-    </rows>
-    <rows
-     name="look_up"
-     value="look_up">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Look Up" />
-    </rows>
-    <rows
-     name="look_down"
-     value="look_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Look Down" />
-    </rows>
-    <rows
-     name="move_forward"
-     value="move_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward" />
-    </rows>
-    <rows
-     name="move_backward"
-     value="move_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward" />
-    </rows>
-    <rows
-     name="move_forward_fast"
-     value="move_forward_fast">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward Fast" />
-    </rows>
-    <rows
-     name="move_backward_fast"
-     value="move_backward_fast">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward Fast" />
-    </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"
-     value="spin_over">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Over" />
-    </rows>
-    <rows
-     name="spin_under"
-     value="spin_under">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Under" />
-    </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" />
-    </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" />
-    </rows>
-    <rows
-     name="pan_up"
-     value="pan_up">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Up" />
-    </rows>
-    <rows
-     name="pan_down"
-     value="pan_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Down" />
-    </rows>
-    <rows
-     name="pan_left"
-     value="pan_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Left" />
-    </rows>
-    <rows
-     name="pan_right"
-     value="pan_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Right" />
-    </rows>
-    <rows
-     name="pan_in"
-     value="pan_in">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan In" />
-    </rows>
-    <rows
-     name="pan_out"
-     value="pan_out">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Out" />
-    </rows>
-    <rows
-     name="spin_around_ccw"
-     value="spin_around_ccw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around counterclockwise"
-         value="Counterclockwise" />
-    </rows>
-    <rows
-     name="spin_around_cw"
-     value="spin_around_cw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around clockwise"
-         value="Clockwise" />
-    </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>
-    <rows
-     enabled="false">
-        <columns
-         type="icon"
-         color="0 0 0 0.7"
-         halign="center"
-         value="menu_separator" />
-    </rows>
-    <rows
-     enabled="false"
-     name="editing_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Editing"
-         name="lst_action"
-         value="Tool_Dozer" />
-    </rows>
-    <rows
-     name="edit_avatar_spin_ccw"
-     value="edit_avatar_spin_ccw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around avatar counterclockwise"
-         value="Counterclockwise" />
-    </rows>
-    <rows
-     name="edit_avatar_spin_cw"
-     value="edit_avatar_spin_cw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around avatar clockwise"
-         value="Clockwise" />
-    </rows>
-    <rows
-     name="edit_avatar_spin_over"
-     value="edit_avatar_spin_over">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin over avatar"
-         value="Camera Spin Over" />
-    </rows>
-    <rows
-     name="edit_avatar_spin_under"
-     value="edit_avatar_spin_under">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin under avatar"
-         value="Camera Spin Under" />
-    </rows>
-    <rows
-     name="edit_avatar_move_forward"
-     value="edit_avatar_move_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward" />
-    </rows>
-    <rows
-     name="edit_avatar_move_backward"
-     value="edit_avatar_move_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward" />
-    </rows>
-    <rows
-     enabled="false">
-        <columns
-         type="icon"
-         color="0 0 0 0.7"
-         halign="center"
-         value="menu_separator" />
-    </rows>
-    <rows
-     enabled="false"
-     name="media_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Sound and Media"
-         name="lst_action"
-         value="Audio_Press" />
-    </rows>
-    <rows
-     name="toggle_pause_media"
-     value="toggle_pause_media">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Play/Pause Media" />
-    </rows>
-    <rows
-     name="toggle_enable_media"
-     value="toggle_enable_media">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Play/Stop All Media" />
-    </rows>
-    <rows
-     name="voice_follow_key"
-     value="voice_follow_key">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Voice" />
-    </rows>
-    <rows
-     name="toggle_voice"
-     value="toggle_voice">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Toggle Voice" />
-    </rows>
-    <rows
-     name="start_chat"
-     value="start_chat">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Start Chat" />
-    </rows>
-    <rows
-     name="start_gesture"
-     value="start_gesture">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Start Gesture" />
-    </rows>
-</contents>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index ee730dcb01..0e62d50072 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -169,13 +169,6 @@ https://accounts.secondlife.com/change_email/
          layout="topleft"
          help_topic="preferences_uploads_tab"
          name="uploads" />
-        <panel
-         class="panel_preference_controls"
-         filename="panel_preferences_controls.xml"
-         label="Controls"
-         layout="topleft"
-         help_topic="preferences_controls_tab"
-         name="controls" />
     </tab_container>
 
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 48d9eee4cd..4e89df5a73 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -4,27 +4,10 @@
  border="false"
  can_close="false"
  can_minimize="false"
- height="116"
+ height="90"
  layout="topleft"
  name="modal container"
- width="272">
-  <floater.string
-   name="keyboard">
-    Keyboard
-  </floater.string>
-  <floater.string
-   name="mouse">
-    Mouse Buttons
-  </floater.string>
-  <floater.string
-   name="basic_description">
-Press a key to set your trigger.
-Allowed input: [INPUT].
-  </floater.string>
-  <floater.string
-   name="reserved_by_menu">
-Combination [KEYSTR] is reserved by menu.
-  </floater.string>
+ width="240">
     <text
      type="string"
      halign="center"
@@ -33,47 +16,19 @@ Combination [KEYSTR] is reserved by menu.
      height="30"
      layout="topleft"
      left="30"
-     name="descritption"
+     name="Save item as:"
      top="25"
      word_wrap="true"
-     width="212">
-Press a key to set your trigger.
-Allowed input: [INPUT].
+     width="180">
+        Press a key to set your Speak button trigger.
     </text>
-    <check_box
-     follows="top|left"
-     height="20"
-     initial_value="false"
-     label="Apply to all"
-     layout="topleft"
-     left="90"
-     name="apply_all"
-     tool_tip="Viewer uses different control combinations depending on what you are doing in world, setting this will apply your change to all combinations"
-     top_pad="8"
-     width="160" />
-  
-    <button
-     height="23"
-     label="Set Empty"
-     layout="topleft"
-     left="8"
-     name="SetEmpty"
-     top_pad="6"
-     width="80" />
-    <button
-     height="23"
-     label="Default"
-     layout="topleft"
-     left_pad="8"
-     name="Default"
-     top_delta="0"
-     width="80" />
     <button
      height="23"
      label="Cancel"
+     label_selected="Cancel"
      layout="topleft"
-     left_pad="8"
+     right="-10"
      name="Cancel"
-     top_delta="0"
-     width="80" />
+     top_pad="8"
+     width="100" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4e284e1011..32a801e1a3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11420,19 +11420,6 @@ Cannot create large prims that intersect other residents.  Please re-try when ot
      notext="Cancel"
      yestext="OK"/>
   </notification>
-  
-  <notification
-   icon="alertmodal.tga"
-   name="PreferenceControlsDefaults"
-   type="alertmodal">
-    Do you want to restore default values for controls?
-    <tag>confirm</tag>
-    <usetemplate
-       canceltext="Cancel"
-       name="yesnocancelbuttons"
-       notext="Current mode"
-       yestext="All modes"/>
-  </notification>
     
   <notification
    icon="alertmodal.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
deleted file mode 100644
index 904387909e..0000000000
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel
- border="true"
- follows="all"
- height="408"
- label="Controls"
- layout="topleft"
- left="102"
- name="controls"
- top="1"
- width="517">
-  <combo_box
-   follows="top|left"
-   layout="topleft"
-   top="6"
-   left="10"
-   height="23"
-   width="140"
-   name="key_mode">
-    <combo_box.item
-     label="Third Person "
-     name="third_person"
-     value="1"/>
-    <combo_box.item
-     label="First Person (Mouselook)"
-     name="first_person"
-     value="0"/>
-    <combo_box.item
-     label="Edit Avatar"
-     name="edit_avatar"
-     value="2"/>
-    <combo_box.item
-     label="Sitting"
-     name="sitting"
-     value="3"/>
-  </combo_box>
-
-  <button
-   follows="top|left"
-   layout="topleft"
-   top="6"
-   right="-10"
-   height="23"
-   width="140"
-   label="Restore Defaults"
-   tool_tip="Restores default values for all control modes."
-   name="restore_defaults"/>
-
-  <scroll_list
-   draw_heading="true"
-   follows="all"
-   layout="topleft"
-   column_padding="0"
-   selection_type="header"
-   top="31"
-   left="3"
-   bottom="-3"
-   right="-3"
-   can_sort="false"
-   multi_select="false"
-   name="controls_list"
-   fg_disable_color="ScrollUnselectedColor"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index d106456b31..8794e3bf95 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -195,6 +195,70 @@
    name="invert_mouse"
    top_delta="0"
    width="128" />
+  <text
+   follows="left|top"
+   type="string"
+   length="1"
+   height="10"
+   layout="topleft"
+   left="86"
+   name="single_click_action_lbl"
+   width="150"
+   top_pad="20">
+    Single click on land:
+  </text>
+  <combo_box
+   height="23"
+   layout="topleft"
+   left_pad="10"
+   top_delta="-6"
+   name="single_click_action_combo"
+   width="200">
+    <combo_box.item
+     label="No action"
+     name="0"
+     value="0"/>
+    <combo_box.item
+     label="Move to clicked point"
+     name="1"
+     value="1"/>
+    <combo_box.commit_callback
+     function="Pref.ClickActionChange"/>
+  </combo_box>
+  <text
+   follows="left|top"
+   type="string"
+   length="1"
+   height="10"
+   layout="topleft"
+   left="86"
+   name="double_click_action_lbl"
+   width="150"
+   top_pad="12">
+    Double click on land:
+  </text>
+  <combo_box
+   height="23"
+   layout="topleft"
+   left_pad="10"
+   top_delta="-6"
+   name="double_click_action_combo"
+   width="200">
+    <combo_box.item
+     label="No action"
+     name="0"
+     value="0"/>
+    <combo_box.item
+     label="Move to clicked point"
+     name="1"
+     value="1"/>
+    <combo_box.item
+     label="Teleport to clicked point"
+     name="2"
+     value="2"/>
+    <combo_box.commit_callback
+     function="Pref.ClickActionChange"/>
+  </combo_box>
   <button
    height="23"
    label="Other Devices"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 2ea20570b1..65b9a64111 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -463,13 +463,52 @@
   enabled_control="EnableVoiceChat"
   control_name="PushToTalkToggle"
   height="15"
-  label="Toggle speak on/off when I press button in toolbar"
+  label="Toggle speak on/off when I press:"
   layout="topleft"
   left="44"
   name="push_to_talk_toggle_check"
   width="237"
   tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
   top_pad="3"/>
+  <line_editor
+   follows="top|left"
+   control_name="PushToTalkButton"
+   enabled="false"
+   enabled_control="EnableVoiceChat"
+   height="23"
+   left="80"
+   max_length_bytes="200"
+   name="modifier_combo"
+   label="Push-to-Speak trigger"
+   top_pad="3"
+   width="200" />
+  <button
+   layout="topleft"
+   follows="top|left"
+   enabled_control="EnableVoiceChat"
+   height="23"
+   label="Set Key"
+   left_pad="5"
+   name="set_voice_hotkey_button"
+   width="100">
+    <button.commit_callback
+    function="Pref.VoiceSetKey" />
+  </button>
+  <button
+     enabled_control="EnableVoiceChat"
+     follows="top|left"
+     halign="center"
+     height="23"
+     image_overlay="Refresh_Off"
+     layout="topleft"
+     tool_tip="Reset to Middle Mouse Button"
+     mouse_opaque="true"
+     name="set_voice_middlemouse_button"
+     left_pad="5"
+     width="25">
+    <button.commit_callback
+    function="Pref.VoiceSetMiddleMouse" />
+  </button>
   <button
    control_name="ShowDeviceSettings"
    follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index cbbb699d7c..73ee8332cc 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4089,15 +4089,6 @@ Try enclosing path to the editor with double quotes.
   <string name="Z">Z</string>
   <!-- Key names end -->
 
-  <!-- Mouse button names (short) begin -->
-  <string name="LMB">LMB</string>
-  <string name="MMB">MMB</string>
-  <string name="RMB">RMB</string>
-  <string name="MB4">MB4</string>
-  <string name="MB5">MB5</string>
-  <string name="Double LMB">Double LMB</string>
-  <!-- Mouse button names end -->
-
   <!-- llviewerwindow -->
   <string name="BeaconParticle">Viewing particle beacons (blue)</string>
   <string name="BeaconPhysical">Viewing physical object beacons (green)</string>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0a96444a7a..e79b45f2b0 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -599,13 +599,11 @@ class WindowsManifest(ViewerManifest):
             config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release'
             with self.prefix(src=os.path.join(pkgdir, 'bin', config)):
                 self.path("chrome_elf.dll")
-                self.path("d3dcompiler_43.dll")
                 self.path("d3dcompiler_47.dll")
                 self.path("libcef.dll")
                 self.path("libEGL.dll")
                 self.path("libGLESv2.dll")
                 self.path("dullahan_host.exe")
-                self.path("natives_blob.bin")
                 self.path("snapshot_blob.bin")
                 self.path("v8_context_snapshot.bin")
 
@@ -800,6 +798,7 @@ class WindowsManifest(ViewerManifest):
         for exe in (
             self.final_exe(),
             "SLVersionChecker.exe",
+            "llplugin/dullahan_host.exe",
             ):
             self.sign(exe)
             
@@ -833,13 +832,13 @@ class WindowsManifest(ViewerManifest):
 
     def sign(self, exe):
         sign_py = os.environ.get('SIGN', r'C:\buildscripts\code-signing\sign.py')
-        python  = os.environ.get('PYTHON', 'python')
+        python  = os.environ.get('PYTHON', sys.executable)
         if os.path.exists(sign_py):
             dst_path = self.dst_path_of(exe)
             print "about to run signing of: ", dst_path
             self.run_command([python, sign_py, dst_path])
         else:
-            print "Skipping code signing of %s: %s not found" % (exe, sign_py)
+            print "Skipping code signing of %s %s: %s not found" % (self.dst_path_of(exe), exe, sign_py)
 
     def escape_slashes(self, path):
         return path.replace('\\', '\\\\\\\\')
@@ -1110,46 +1109,55 @@ class DarwinManifest(ViewerManifest):
                     # $viewer_app/Contents/Frameworks/Chromium Embedded Framework.framework
                     SLPlugin_framework = self.relsymlinkf(CEF_framework, catch=False)
 
-                    # copy DullahanHelper.app
-                    self.path2basename(relpkgdir, 'DullahanHelper.app')
-
-                    # and fix that up with a Frameworks/CEF symlink too
-                    with self.prefix(dst=os.path.join(
-                        'DullahanHelper.app', 'Contents', 'Frameworks')):
-                        # from Dullahan Helper.app/Contents/Frameworks/Chromium Embedded
-                        # Framework.framework back to
-                        # SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework
-                        # Since SLPlugin_framework is itself a
-                        # symlink, don't let relsymlinkf() resolve --
-                        # explicitly call relpath(symlink=True) and
-                        # create that symlink here.
-                        DullahanHelper_framework = \
-                            self.symlinkf(self.relpath(SLPlugin_framework, symlink=True),
-                                          catch=False)
-
-                    # change_command includes install_name_tool, the
-                    # -change subcommand and the old framework rpath
-                    # stamped into the executable. To use it with
-                    # run_command(), we must still append the new
-                    # framework path and the pathname of the
-                    # executable to change.
-                    change_command = [
-                        'install_name_tool', '-change',
-                        '@rpath/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework']
-
-                    with self.prefix(dst=os.path.join(
-                        'DullahanHelper.app', 'Contents', 'MacOS')):
-                        # Now self.get_dst_prefix() is, at runtime,
-                        # @executable_path. Locate the helper app
-                        # framework (which is a symlink) from here.
-                        newpath = os.path.join(
-                            '@executable_path',
-                            self.relpath(DullahanHelper_framework, symlink=True),
-                            frameworkname)
-                        # and restamp the DullahanHelper executable
-                        self.run_command(
-                            change_command +
-                            [newpath, self.dst_path_of('DullahanHelper')])
+                    # for all the multiple CEF/Dullahan (as of CEF 76) helper app bundles we need:
+                    for helper in (
+                        "DullahanHelper",
+                        "DullahanHelper (GPU)",
+                        "DullahanHelper (Renderer)",
+                        "DullahanHelper (Plugin)",
+                    ):
+                        # app is the directory name of the app bundle, with app/Contents/MacOS/helper as the executable
+                        app = helper + ".app"
+
+                        # copy DullahanHelper.app
+                        self.path2basename(relpkgdir, app)
+
+                        # and fix that up with a Frameworks/CEF symlink too
+                        with self.prefix(dst=os.path.join(
+                                app, 'Contents', 'Frameworks')):
+                            # from Dullahan Helper *.app/Contents/Frameworks/Chromium Embedded
+                            # Framework.framework back to
+                            # SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework
+                            # Since SLPlugin_framework is itself a
+                            # symlink, don't let relsymlinkf() resolve --
+                            # explicitly call relpath(symlink=True) and
+                            # create that symlink here.
+                            helper_framework = \
+                            self.symlinkf(self.relpath(SLPlugin_framework, symlink=True), catch=False)
+
+                        # change_command includes install_name_tool, the
+                        # -change subcommand and the old framework rpath
+                        # stamped into the executable. To use it with
+                        # run_command(), we must still append the new
+                        # framework path and the pathname of the
+                        # executable to change.
+                        change_command = [
+                            'install_name_tool', '-change',
+                            '@rpath/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework']
+
+                        with self.prefix(dst=os.path.join(
+                                app, 'Contents', 'MacOS')):
+                            # Now self.get_dst_prefix() is, at runtime,
+                            # @executable_path. Locate the helper app
+                            # framework (which is a symlink) from here.
+                            newpath = os.path.join(
+                                '@executable_path',
+                                    self.relpath(helper_framework, symlink=True),
+                                frameworkname)
+                                # and restamp the Dullahan Helper executable itself
+                            self.run_command(
+                                change_command +
+                                    [newpath, self.dst_path_of(helper)])
 
                 # SLPlugin plugins
                 with self.prefix(dst="llplugin"):