diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 88cbb340a..794f4c952 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -666,11 +666,13 @@ void LLAgent::setFlying(BOOL fly)
 			return;
 		}
 
+		/* Singu Note: We don't take off while sitting, don't bother with this check, let us toggle fly whenever.
 		// don't allow taking off while sitting
 		if (fly && gAgentAvatarp->isSitting())
 		{
 			return;
 		}
+		*/
 	}
 
 	if (fly)
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index a72c8be5b..8d4820dce 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -307,7 +307,12 @@ void LLToolBar::refresh()
 	setVisible(show && !mouselook);
 
 	BOOL sitting = FALSE;
-	if (gAgentAvatarp)
+	static LLCachedControl<bool> continue_flying_on_unsit("LiruContinueFlyingOnUnsit");
+	if (continue_flying_on_unsit)
+	{
+		sitting = false;
+	}
+	else if (gAgentAvatarp)
 	{
 		sitting = gAgentAvatarp->isSitting();
 	}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 43e33f2bd..fed4fee46 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3984,7 +3984,12 @@ class LLWorldEnableFly : public view_listener_t
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
 		BOOL sitting = FALSE;
-		if (gAgentAvatarp)
+		static LLCachedControl<bool> continue_flying_on_unsit("LiruContinueFlyingOnUnsit");
+		if (continue_flying_on_unsit)
+		{
+			sitting = false;
+		}
+		else if (gAgentAvatarp)
 		{
 			sitting = gAgentAvatarp->isSitting();
 		}