diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-06-17 11:37:21 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-06-17 11:37:21 -0400 |
| commit | b770415b6a2f52946eafb99800af7409b900cd8e (patch) | |
| tree | 11c6e9bdeee80d486445ea301e97742c00cdff7a /indra/newview/llviewerwindow.cpp | |
| parent | be72a10a89f98a5c7c372ecee3d839be2031b80a (diff) | |
| parent | 7cc006347822a70f36175dc2627814a0eaeb9c0a (diff) | |
Merge (and resolve conflict) from q/viewer-release
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 17147d44af..22911ff241 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(); |