diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-08 14:58:53 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-08 14:58:53 -0500 |
| commit | 399d70eede54dff2ba6d14b33f85fdad4d33a662 (patch) | |
| tree | ce922e0963b8d46c236c4320b574916507fa3b65 /indra/newview/llviewermediafocus.h | |
| parent | 7e1932878563e5847335d5dcb66c9b23232c372c (diff) | |
| parent | 19f4240f977fc26d97e686c4e3a1f13b063e191c (diff) | |
automated merge viewer2.0->viewer2.0
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 89ee0ae283..002044ea2e 100644 --- a/indra/newview/llviewermediafocus.h +++ b/indra/newview/llviewermediafocus.h @@ -66,7 +66,7 @@ public: void update(); - static void setCameraZoom(LLViewerObject* object, LLVector3 normal, F32 padding_factor); + static void 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); |