diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-06-16 14:29:10 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-06-16 14:29:10 -0400 |
commit | 5635f10c41a72c62cbf44ae9415aadb83447ca22 (patch) | |
tree | a94b877a8dd8028dc9a618ca7966f23426992755 /indra/newview/llviewerwindow.cpp | |
parent | 823ae2ea98c7fd24053d7bc97fbc178b654190b4 (diff) | |
parent | abb0ccb762f54127b38bd9a9be4a852e7e489d48 (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 0a65cb7330..c4135f9409 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2462,7 +2462,7 @@ void LLViewerWindow::updateUI() LLLayoutStack::updateClass(); // use full window for world view when not rendering UI - bool world_view_uses_full_window = !gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI); + bool world_view_uses_full_window = gAgentCamera.cameraMouselook() || !gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI); updateWorldViewRect(world_view_uses_full_window); LLView::sMouseHandlerMessage.clear(); |