diff options
author | Richard Linden <none@none> | 2010-09-28 17:24:38 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-28 17:24:38 -0700 |
commit | 633e8f44d9c329ca09c91963d53854e14136f537 (patch) | |
tree | eb49607b353551145b0e75419a46c9f071158a29 /indra/llui/llview.h | |
parent | b2ebf4c245fa4b5024c6c2bee46c426ad58cb14c (diff) | |
parent | 51ad14db881a68722530d54b5ac799a49f11264b (diff) |
merge
Diffstat (limited to 'indra/llui/llview.h')
-rw-r--r-- | indra/llui/llview.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index e6e0a41962..654e99563e 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -116,7 +116,8 @@ public: visible, mouse_opaque, use_bounding_rect, - from_xui; + from_xui, + focus_root; Optional<S32> tab_group, default_tab_group; |