diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-02 02:18:57 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-02 02:18:57 +0300 |
| commit | 1fe32c16fb299c1eb6a47e6860198f07b0c806c4 (patch) | |
| tree | 04a3c93faa058e547140c9d43d15fb9b1467f2a6 /indra/newview/llviewercamera.h | |
| parent | 18bb3f6b86b32c4ca22f0466ee175d68969a03fd (diff) | |
| parent | 9437d1511e2c4b73a58abc823b1ca2a29a8a4d04 (diff) | |
Merged in lindenlab/viewer-bear
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. |