diff options
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 273ca8bd1a..5f95e9ccf1 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2293,7 +2293,9 @@ void LLViewerWindow::handleScrollWheel(S32 clicks) } // Zoom the camera in and out behavior - gAgent.handleScrollWheel(clicks); + + if(top_ctrl == 0 && mWorldViewRect.pointInRect(mCurrentMousePoint.mX, mCurrentMousePoint.mY) ) + gAgent.handleScrollWheel(clicks); return; } @@ -4168,8 +4170,9 @@ void LLViewerWindow::drawMouselookInstructions() instructions, 0, getVirtualWorldViewRect().getCenterX(), getVirtualWorldViewRect().mBottom + INSTRUCTIONS_PAD, - LLColor4( 0.0f, 0.0f, 0.0f, 0.6f ), - LLFontGL::HCENTER, LLFontGL::TOP); + LLColor4( 1.0f, 1.0f, 1.0f, 0.5f ), + LLFontGL::HCENTER, LLFontGL::TOP, + LLFontGL::NORMAL,LLFontGL::DROP_SHADOW); } S32 LLViewerWindow::getWindowHeight() const |