diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-19 17:59:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-19 17:59:55 -0500 |
| commit | 0031e9a97be1bf6e9fe773c23506494d09ce91ae (patch) | |
| tree | 220f195c82174b7cc8e94dceb2553e59fe5837a5 /indra/llui/llfocusmgr.h | |
| parent | b7edc965bc77ab21e9a1e3f6b424299a50053529 (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
merge up to 3.6.10-release; some of the storm-68 changes lost
Diffstat (limited to 'indra/llui/llfocusmgr.h')
| -rwxr-xr-x[-rw-r--r--] | 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 100644..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 |