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.h | |
| parent | deb8f582c56bd6035f9f2c3d57b8865a1c928936 (diff) | |
| parent | 4040b452a37622feec0ad1d4eeb0492c636d1cd5 (diff) | |
Merged in MAINT-6872
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. |