diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-02 17:16:03 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-02 17:16:03 +0200 |
| commit | 28c0bcf7e608db5bd5c3811906be03f1457dd45d (patch) | |
| tree | 5ac94e9dd3d46ee2db797dd43acfcc098427bf5b /indra/newview/llviewermediafocus.h | |
| parent | d3d53c9e41f6de250e7bd059d4120b9be08d31da (diff) | |
| parent | d8b3e7a021b97bf3cb4494c4d9228ed0a3c16738 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermediafocus.h')
| -rw-r--r-- | indra/newview/llviewermediafocus.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h index c1179de39d..e5f36d341c 100644 --- a/indra/newview/llviewermediafocus.h +++ b/indra/newview/llviewermediafocus.h @@ -81,6 +81,12 @@ public: LLViewerMediaImpl* getHoverMediaImpl(); LLViewerObject* getHoverObject(); S32 getHoverFace() { return mHoverObjectFace; } + + // Try to focus/zoom on the specified media (if it's on an object in world). + void focusZoomOnMedia(LLUUID media_id); + + // Return the ID of the media instance the controls are currently attached to (either focus or hover). + LLUUID getControlsMediaID(); protected: /*virtual*/ void onFocusReceived(); |