summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2010-03-25 12:06:39 +0200
committerEugene Mutavchi <emutavchi@productengine.com>2010-03-25 12:06:39 +0200
commit0f32c14cab77717dab75b8d91302104e8f168ceb (patch)
treea5568c600e3dca5f613d108734e507cfdc75d531 /indra
parentd5d9668a59895874951fb3e5927ea0159270a6e8 (diff)
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
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerwindow.cpp2
1 files changed, 1 insertions, 1 deletions
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();