diff options
| author | max nikolenko <maximnproductengine@lindenlab.com> | 2016-11-16 17:48:15 +0000 |
|---|---|---|
| committer | max nikolenko <maximnproductengine@lindenlab.com> | 2016-11-16 17:48:15 +0000 |
| commit | 30c8ea4d2c0c48e18835c32dafc35d3e16a2b2d9 (patch) | |
| tree | c7bc86e8b1d4d778bc489b7104aa596a5d1a062a /indra/newview/llviewercamera.cpp | |
| parent | deb8f582c56bd6035f9f2c3d57b8865a1c928936 (diff) | |
| parent | 4040b452a37622feec0ad1d4eeb0492c636d1cd5 (diff) | |
Merged in MAINT-6872
Diffstat (limited to 'indra/newview/llviewercamera.cpp')
| -rw-r--r-- | indra/newview/llviewercamera.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp index 57a0195d23..778e275727 100644 --- a/indra/newview/llviewercamera.cpp +++ b/indra/newview/llviewercamera.cpp @@ -113,6 +113,7 @@ LLViewerCamera::LLViewerCamera() : LLCamera() { calcProjection(getFar()); mCameraFOVDefault = DEFAULT_FIELD_OF_VIEW; + mPrevCameraFOVDefault = DEFAULT_FIELD_OF_VIEW; mCosHalfCameraFOV = cosf(mCameraFOVDefault * 0.5f); mPixelMeterRatio = 0.f; mScreenPixelArea = 0; @@ -882,6 +883,15 @@ void LLViewerCamera::setDefaultFOV(F32 vertical_fov_rads) mCosHalfCameraFOV = cosf(mCameraFOVDefault * 0.5f); } +BOOL LLViewerCamera::isDefaultFOVChanged() +{ + if(mPrevCameraFOVDefault != mCameraFOVDefault) + { + mPrevCameraFOVDefault = mCameraFOVDefault; + return !gSavedSettings.getBOOL("IgnoreFOVZoomForLODs"); + } + return FALSE; +} // static void LLViewerCamera::updateCameraAngle( void* user_data, const LLSD& value) |