summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-06-15 15:25:55 -0700
committerRichard Linden <none@none>2010-06-15 15:25:55 -0700
commit4fb3198642026c8679fc64e6d3653baae35b5988 (patch)
treee9759fd8caa524d12453fd8e17f45d2db74cee8e
parent251a695c784bd861801dffee57bd5bebf48748e3 (diff)
EXT-7090 WIP STRG(CTRL)+SHIFT+S in Mouselook doesnt make a snapshot
made world view extend to where menu bar would normally be when in mouselook
-rw-r--r--indra/newview/llstatusbar.cpp3
-rw-r--r--indra/newview/llviewerwindow.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index ac419d8dc7..8c8fbdc88c 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -371,8 +371,7 @@ void LLStatusBar::refresh()
void LLStatusBar::setVisibleForMouselook(bool visible)
{
mTextTime->setVisible(visible);
- getChild<LLUICtrl>("buycurrency")->setVisible(visible);
- getChild<LLUICtrl>("buyL")->setVisible(visible);
+ getChild<LLUICtrl>("balance_bg")->setVisible(visible);
mBtnVolume->setVisible(visible);
mMediaToggle->setVisible(visible);
mSGBandwidth->setVisible(visible);
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();