Permalink
Browse files

Fix SV-2076: Mouselook button shouldn't show under most circumstances

Thanks to routergray for testing this fix.
  • Loading branch information...
1 parent 5bb9cda commit 31dbe29cae16ef8de4486a0fa4d5a0e874a26958 @Lirusaito Lirusaito committed Jun 27, 2016
Showing with 1 addition and 1 deletion.
  1. +1 −1 indra/newview/lloverlaybar.cpp
@@ -324,7 +324,7 @@ void LLOverlayBar::refresh()
}
buttons_changed |= updateButtonVisiblity(mNotBusy, gAgent.isDoNotDisturb()) != NULL;
buttons_changed |= updateButtonVisiblity(mFlyCam,LLViewerJoystick::getInstance()->getOverrideCamera()) != NULL;
- buttons_changed |= updateButtonVisiblity(mMouseLook,gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)||gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX)) != NULL;
+ buttons_changed |= updateButtonVisiblity(mMouseLook,gAgent.isControlBlocked(CONTROL_ML_LBUTTON_DOWN_INDEX)||gAgent.isControlBlocked(CONTROL_ML_LBUTTON_UP_INDEX)) != NULL;
// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
// buttons_changed |= updateButtonVisiblity("Stand Up", isAgentAvatarValid() && gAgentAvatarp->isSitting()) != NULL;
buttons_changed |= updateButtonVisiblity(mStandUp,isAgentAvatarValid() && gAgentAvatarp->isSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) != NULL;

0 comments on commit 31dbe29

Please sign in to comment.