summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-01 17:12:12 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-01 17:12:12 +0100
commit569f322f0d43ba4e1f079d362d333af5b84a0e32 (patch)
tree7141309c52129400982944d1f91667b74d65c6cb /indra/newview/llviewerwindow.cpp
parent8421d3dcd3aad07efecbfa490ccc8e71119b9cab (diff)
parentb98ebdecda66a1f08e74321cb255e39edfbc47dd (diff)
PE merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-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 85c961f34a..d7d5cbbd10 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2090,7 +2090,7 @@ void LLViewerWindow::draw()
// Draw tool specific overlay on world
LLToolMgr::getInstance()->getCurrentTool()->draw();
- if( gAgentCamera.cameraMouselook() )
+ if( gAgentCamera.cameraMouselook() || LLFloaterCamera::inFreeCameraMode() )
{
drawMouselookInstructions();
stop_glerror();