diff options
author | simon <none@none> | 2013-10-23 14:14:36 -0700 |
---|---|---|
committer | simon <none@none> | 2013-10-23 14:14:36 -0700 |
commit | 64c5afa196d1692cd0823ccd555f1f7bb32f529d (patch) | |
tree | c0ee113ee6aae7009446756f4c10188134ea7179 /indra/llui/llfocusmgr.h | |
parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
Merge latest viewer-release with FBC
Diffstat (limited to 'indra/llui/llfocusmgr.h')
-rwxr-xr-x | indra/llui/llfocusmgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h index 25ae1d2579..1c7326260c 100755 --- a/indra/llui/llfocusmgr.h +++ b/indra/llui/llfocusmgr.h @@ -97,7 +97,7 @@ public: void triggerFocusFlash(); BOOL getAppHasFocus() const { return mAppHasFocus; } void setAppHasFocus(BOOL focus); - LLUICtrl* getLastFocusForGroup(LLView* subtree_root) const; + LLView* getLastFocusForGroup(LLView* subtree_root) const; void clearLastFocusForGroup(LLView* subtree_root); // If setKeyboardFocus(NULL) is called, and there is a non-NULL default |