diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:46:29 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:46:29 +0200 |
| commit | 99308bb8a828c991be06c8620f02d6618328be15 (patch) | |
| tree | 42d44f6a2eedaa73d60d733a61f0b6ba56d4361a /indra/newview/llviewercamera.h | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
| parent | df376c029936da11b3e1dda54f9c327de50440a8 (diff) | |
Merged in andreyl_productengine/viewer64-marchcat (DRTVWR-431 fixes)
Diffstat (limited to 'indra/newview/llviewercamera.h')
| -rw-r--r-- | indra/newview/llviewercamera.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewercamera.h b/indra/newview/llviewercamera.h index f8c973690a..5901de289f 100644 --- a/indra/newview/llviewercamera.h +++ b/indra/newview/llviewercamera.h @@ -115,6 +115,8 @@ public: void setDefaultFOV(F32 fov) ; F32 getDefaultFOV() { return mCameraFOVDefault; } + BOOL isDefaultFOVChanged(); + BOOL cameraUnderWater() const; BOOL areVertsVisible(LLViewerObject* volumep, BOOL all_verts); @@ -138,6 +140,7 @@ protected: mutable LLMatrix4 mProjectionMatrix; // Cache of perspective matrix mutable LLMatrix4 mModelviewMatrix; F32 mCameraFOVDefault; + F32 mPrevCameraFOVDefault; F32 mCosHalfCameraFOV; LLVector3 mLastPointOfInterest; F32 mPixelMeterRatio; // Divide by distance from camera to get pixels per meter at that distance. |