diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-01 17:54:08 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-01 17:54:08 -0400 |
| commit | 2854008e8edd3419fe37a8c4971223eda5945bfa (patch) | |
| tree | 83640a42fcc5f71200a19e173a95da433760cf74 /indra/newview/llviewerwindow.cpp | |
| parent | 1ec47c39a6c4a6e7e518d0b91a87f50596362f06 (diff) | |
| parent | 406b595e8c6811c2550340ba316328289d8b856f (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
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(); |