diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-29 16:09:08 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-29 16:09:08 -0400 |
| commit | 125b789239b5adb5f810b3586a95f5d5f8a17c40 (patch) | |
| tree | 9650173fc466d363a9092722d04456c15b078f8d /indra/newview/llviewerwindow.cpp | |
| parent | 17d2a3b9fb24ea56eb5e70007a2502bbef436a65 (diff) | |
| parent | 33065ed28835f17aed22bd0d5f742bc5bb76e1a4 (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; |