diff options
| author | Richard Nelson <none@none> | 2010-06-25 10:37:47 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-06-25 10:37:47 -0700 |
| commit | 1596b01df60a00f9957885943ba7652dd4adce39 (patch) | |
| tree | 29ba879b904deb4d63361b2c0f4212a30b1834a2 | |
| parent | bd068caa4ca6f0a80d3e206bca1d7c88d18836a5 (diff) | |
| parent | 742c1238790a5219864bac617a95065e827adda3 (diff) | |
merge
| -rw-r--r-- | indra/newview/llagentcamera.h | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h index 3b8f88733a..fc78fef6d0 100644 --- a/indra/newview/llagentcamera.h +++ b/indra/newview/llagentcamera.h @@ -82,6 +82,7 @@ public: void init(); void cleanup(); void setAvatarObject(LLVOAvatarSelf* avatar); + bool isInitialized() { return mInitialized; } private: bool mInitialized; 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; |