diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-11-29 11:31:08 -0800 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-11-29 11:31:08 -0800 |
| commit | a12e282cd473d5b7fc3e23fdd8fdfed11cc88864 (patch) | |
| tree | cf07df2ae2219009bdc8337f4f9b4f1247fbd65d /indra/newview/llmediactrl.h | |
| parent | 28f3b032076929bf595c34ab10666930c7ea1464 (diff) | |
| parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) | |
merge changes for 5.0.9-release
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rw-r--r-- | indra/newview/llmediactrl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 125a67e23e..11400c8274 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -181,6 +181,9 @@ public: protected: void convertInputCoords(S32& x, S32& y); + private: + void calcOffsetsAndSize(S32 *x_offset, S32 *y_offset, S32 *width, S32 *height); + private: void onVisibilityChanged ( const LLSD& new_visibility ); void onPopup(const LLSD& notification, const LLSD& response); |