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.cpp | |
| parent | b2ebf4c245fa4b5024c6c2bee46c426ad58cb14c (diff) | |
| parent | 51ad14db881a68722530d54b5ac799a49f11264b (diff) | |
merge
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 6ac009956d..267640a226 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -102,6 +102,7 @@ LLView::Params::Params() left_pad("left_pad"), left_delta("left_delta", S32_MAX), from_xui("from_xui", false), + focus_root("focus_root", false), needs_translate("translate"), xmlns("xmlns"), xmlns_xsi("xmlns:xsi"), @@ -117,7 +118,7 @@ LLView::LLView(const LLView::Params& p) mParentView(NULL), mReshapeFlags(FOLLOWS_NONE), mFromXUI(p.from_xui), - mIsFocusRoot(FALSE), + mIsFocusRoot(p.focus_root), mLastVisible(FALSE), mNextInsertionOrdinal(0), mHoverCursor(getCursorFromString(p.hover_cursor)), |