diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-23 01:48:13 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-23 01:48:13 +0300 |
commit | f4bfaeb45e57ae0a62a47dc4f2759a34fe7a7581 (patch) | |
tree | 56720eb39b5056adc8de4f487d3ba00ceea998d0 /indra/newview/llviewermediafocus.h | |
parent | 9abbdb74f254731a1d0a6e4bf3cfe7b8cdaeff8b (diff) | |
parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/newview/llviewermediafocus.h')
-rw-r--r-- | indra/newview/llviewermediafocus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h index fa469c36e3..effd08a559 100644 --- a/indra/newview/llviewermediafocus.h +++ b/indra/newview/llviewermediafocus.h @@ -63,7 +63,7 @@ public: void update(); - static void setCameraZoom(LLViewerObject* object, LLVector3 normal, F32 padding_factor, bool zoom_in_only = false); + static LLVector3d setCameraZoom(LLViewerObject* object, LLVector3 normal, F32 padding_factor, bool zoom_in_only = false); static F32 getBBoxAspectRatio(const LLBBox& bbox, const LLVector3& normal, F32* height, F32* width, F32* depth); bool isFocusedOnFace(LLPointer<LLViewerObject> objectp, S32 face); |