diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-25 19:06:24 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-25 19:06:24 +0100 |
| commit | daabe1fb133d69df938bb58d12f0be26bdc16ead (patch) | |
| tree | c5e66f6859593137c5d58c8b05667f97e0ca5dc9 /indra/newview/llviewerwindow.cpp | |
| parent | c22da3a2a9c4e2fa1e0b0b0c544f5933e91c6369 (diff) | |
| parent | 1596b01df60a00f9957885943ba7652dd4adce39 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index c9c0b72528..6346ac320b 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2329,7 +2329,9 @@ void LLViewerWindow::handleScrollWheel(S32 clicks) // Zoom the camera in and out behavior - if(top_ctrl == 0 && getWorldViewRectScaled().pointInRect(mCurrentMousePoint.mX, mCurrentMousePoint.mY) ) + if(top_ctrl == 0 + && getWorldViewRectScaled().pointInRect(mCurrentMousePoint.mX, mCurrentMousePoint.mY) + && gAgentCamera.isInitialized()) gAgentCamera.handleScrollWheel(clicks); return; |