summaryrefslogtreecommitdiff
path: root/indra/llui/llfocusmgr.h
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-10-25 10:23:11 -0700
committerGraham Linden <graham@lindenlab.com>2013-10-25 10:23:11 -0700
commit6480612a91b0e72fa746d294d8cade4f093c9372 (patch)
tree8d43a33390938c371fbbc5da804bc2def61a3cef /indra/llui/llfocusmgr.h
parent2f0d9b78d28deba58988012a9940cb4f232ec2f9 (diff)
parentea1e1b0925b386cf83178539b8eae9e25c573548 (diff)
Merge 3.6.9 ShareStorm
Diffstat (limited to 'indra/llui/llfocusmgr.h')
-rwxr-xr-xindra/llui/llfocusmgr.h2
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