From 0f32c14cab77717dab75b8d91302104e8f168ceb Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Thu, 25 Mar 2010 12:06:39 +0200
Subject: Fixed normal bug EXT-6324 (View - View Object - should have "press
 ESC to return to World View" message) - added showing the "press ESC to
 return to World View" when viewer is in free camera mode (if mode was started
 by camera floater). Reviewed by Leyla Farazha at
 https://codereview.productengine.com/secondlife/r/97/

--HG--
branch : product-engine
---
 indra/newview/llviewerwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index d91833fd22..e66914fb60 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2088,7 +2088,7 @@ void LLViewerWindow::draw()
 		// Draw tool specific overlay on world
 		LLToolMgr::getInstance()->getCurrentTool()->draw();
 
-		if( gAgent.cameraMouselook() )
+		if( gAgent.cameraMouselook() || LLFloaterCamera::inFreeCameraMode() )
 		{
 			drawMouselookInstructions();
 			stop_glerror();
-- 
cgit v1.2.3