merge

1 files changed, 20 insertions, 9 deletions

diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 2f22512aba..afca9daa67 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -91,12 +91,20 @@ BOOL LLFloaterMove::postBuild()
 	
 	LLDockableFloater::postBuild();
 	
+	// Code that implements floater buttons toggling when user moves via keyboard is located in LLAgent::propagate()
+
 	mForwardButton = getChild<LLJoystickAgentTurn>("forward btn"); 
 	mForwardButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
 
 	mBackwardButton = getChild<LLJoystickAgentTurn>("backward btn"); 
 	mBackwardButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
 
+	mSlideLeftButton = getChild<LLJoystickAgentSlide>("move left btn");
+	mSlideLeftButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
+
+	mSlideRightButton = getChild<LLJoystickAgentSlide>("move right btn");
+	mSlideRightButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
+
 	mTurnLeftButton = getChild<LLButton>("turn left btn"); 
 	mTurnLeftButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
 	mTurnLeftButton->setHeldDownCallback(boost::bind(&LLFloaterMove::turnLeft, this));
@@ -125,8 +133,6 @@ BOOL LLFloaterMove::postBuild()
 	btn = getChild<LLButton>("mode_fly_btn");
 	btn->setCommitCallback(boost::bind(&LLFloaterMove::onFlyButtonClick, this));
 
-	showFlyControls(false);
-
 	initModeTooltips();
 
 	initModeButtonMap();
@@ -345,33 +351,38 @@ void LLFloaterMove::setMovementMode(const EMovementMode mode)
 
 void LLFloaterMove::updateButtonsWithMovementMode(const EMovementMode newMode)
 {
-	showFlyControls(MM_FLY == newMode);
 	setModeTooltip(newMode);
 	setModeButtonToggleState(newMode);
 	setModeTitle(newMode);
 }
 
-void LLFloaterMove::showFlyControls(bool bShow)
-{
-	mMoveUpButton->setVisible(bShow);
-	mMoveDownButton->setVisible(bShow);
-}
-
 void LLFloaterMove::initModeTooltips()
 {
 	control_tooltip_map_t walkTipMap;
 	walkTipMap.insert(std::make_pair(mForwardButton, getString("walk_forward_tooltip")));
 	walkTipMap.insert(std::make_pair(mBackwardButton, getString("walk_back_tooltip")));
+	walkTipMap.insert(std::make_pair(mSlideLeftButton, getString("walk_left_tooltip")));
+	walkTipMap.insert(std::make_pair(mSlideRightButton, getString("walk_right_tooltip")));
+	walkTipMap.insert(std::make_pair(mMoveUpButton, getString("jump_tooltip")));
+	walkTipMap.insert(std::make_pair(mMoveDownButton, getString("crouch_tooltip")));
 	mModeControlTooltipsMap[MM_WALK] = walkTipMap;
 
 	control_tooltip_map_t runTipMap;
 	runTipMap.insert(std::make_pair(mForwardButton, getString("run_forward_tooltip")));
 	runTipMap.insert(std::make_pair(mBackwardButton, getString("run_back_tooltip")));
+	runTipMap.insert(std::make_pair(mSlideLeftButton, getString("run_left_tooltip")));
+	runTipMap.insert(std::make_pair(mSlideRightButton, getString("run_right_tooltip")));
+	runTipMap.insert(std::make_pair(mMoveUpButton, getString("jump_tooltip")));
+	runTipMap.insert(std::make_pair(mMoveDownButton, getString("crouch_tooltip")));
 	mModeControlTooltipsMap[MM_RUN] = runTipMap;
 
 	control_tooltip_map_t flyTipMap;
 	flyTipMap.insert(std::make_pair(mForwardButton, getString("fly_forward_tooltip")));
 	flyTipMap.insert(std::make_pair(mBackwardButton, getString("fly_back_tooltip")));
+	flyTipMap.insert(std::make_pair(mSlideLeftButton, getString("fly_left_tooltip")));
+	flyTipMap.insert(std::make_pair(mSlideRightButton, getString("fly_right_tooltip")));
+	flyTipMap.insert(std::make_pair(mMoveUpButton, getString("fly_up_tooltip")));
+	flyTipMap.insert(std::make_pair(mMoveDownButton, getString("fly_down_tooltip")));
 	mModeControlTooltipsMap[MM_FLY] = flyTipMap;
 
 	setModeTooltip(MM_WALK);