QAR-782 Merge featurettes batch #2

merge featurettes-6-merge-2 -> release
dataserver-is-deprecated

1 files changed, 0 insertions, 18 deletions

diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp
index 483793cfad..7162c2e925 100644
--- a/indra/newview/lloverlaybar.cpp
+++ b/indra/newview/lloverlaybar.cpp
@@ -120,7 +120,6 @@ BOOL LLOverlayBar::postBuild()
 {
 	childSetAction("IM Received",onClickIMReceived,this);
 	childSetAction("Set Not Busy",onClickSetNotBusy,this);
-	childSetAction("Release Keys",onClickReleaseKeys,this);
 	childSetAction("Mouselook",onClickMouselook,this);
 	childSetAction("Stand Up",onClickStandUp,this);
 	childSetVisible("chat_bar", gSavedSettings.getBOOL("ChatVisible"));
@@ -210,17 +209,6 @@ void LLOverlayBar::refresh()
 		buttons_changed = TRUE;
 	}
 
-	BOOL controls_grabbed = gAgent.anyControlGrabbed();
-	button = getChild<LLButton>("Release Keys");
-
-	if (button && button->getVisible() != controls_grabbed)
-	{
-		button->setVisible(controls_grabbed);
-		sendChildToFront(button);
-		moveChildToBackOfTabGroup(button);
-		buttons_changed = TRUE;
-	}
-
 	BOOL mouselook_grabbed;
 	mouselook_grabbed = gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)
 		|| gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX);
@@ -296,12 +284,6 @@ void LLOverlayBar::onClickSetNotBusy(void*)
 
 
 // static
-void LLOverlayBar::onClickReleaseKeys(void*)
-{
-	gAgent.forceReleaseControls();
-}
-
-// static
 void LLOverlayBar::onClickResetView(void* data)
 {
 	handle_reset_view();