summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-04-01 15:33:05 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-04-01 15:33:05 -0700
commitdb0ffdf270f9f9b656333e317a0cf6fadc14a711 (patch)
tree6008b6b3c36dd9cd6bd7e51d63aea7210396e7bf /indra/newview/llviewerwindow.cpp
parent959ec0c305914ac71caa12920ca81230d5d9a6c4 (diff)
parent406b595e8c6811c2550340ba316328289d8b856f (diff)
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();