diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-29 18:56:57 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-29 18:56:57 +0300 |
| commit | d3d2e0be292056ff335ae7a0caf7a6407ef074ca (patch) | |
| tree | 50c227be0cd19c7cedba7360bb4950304a306d01 /indra/newview/llviewerwindow.cpp | |
| parent | 05222b7a32c6e3406f1bae90664181d3699a10e8 (diff) | |
| parent | f308109fe6a96d1cb40185a4fe4f16d8e82d814a (diff) | |
merge
--HG--
branch : product-engine
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; |