summaryrefslogtreecommitdiff
path: root/indra/llui/llfocusmgr.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-09-26 10:39:21 -0700
committerRider Linden <rider@lindenlab.com>2016-09-26 10:39:21 -0700
commit42dce6766435da1deaea19e837629fdf38c0018d (patch)
tree063491157df3319f70c811b2b4555806fcd681f8 /indra/llui/llfocusmgr.cpp
parentd258fe40353642b20524ef320b70e6b9bf0f8ec4 (diff)
parent51bb369a39142ff5049f753099f9638ce68b95dc (diff)
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/llui/llfocusmgr.cpp')
-rw-r--r--indra/llui/llfocusmgr.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 1a51b96fdf..1b213c3418 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -186,7 +186,6 @@ void LLFocusMgr::releaseFocusIfNeeded( LLView* view )
LLUI::removePopup(view);
}
-
void LLFocusMgr::setKeyboardFocus(LLFocusableElement* new_focus, BOOL lock, BOOL keystrokes_only)
{
// notes if keyboard focus is changed again (by onFocusLost/onFocusReceived)