diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-13 17:51:14 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-13 17:51:14 -0500 |
commit | 27f11d9868bc72e7096ae6266af1c6c9318c545e (patch) | |
tree | 12190521b6870891072e312c8b3e8864721aa075 /indra/newview/llmediactrl.h | |
parent | fbab245e487650d6420c9fe33cf07123af12f422 (diff) | |
parent | dd06d42c09e5e1f4b28559059ec8393e53f767a7 (diff) |
merge
Diffstat (limited to 'indra/newview/llmediactrl.h')
-rw-r--r-- | indra/newview/llmediactrl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 65dfbbff78..96bb0c1df5 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -53,7 +53,8 @@ public: ignore_ui_scale, hide_loading, decouple_texture_size, - trusted_content; + trusted_content, + focus_on_click; Optional<S32> texture_width, texture_height; |