diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-02 18:49:43 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-02 18:49:43 -0700 |
| commit | 701facaac4bd4dde76427fac014da6d1e1641c2a (patch) | |
| tree | 72aecf24e5a93f6f85252f81f8994cd0b7a13998 /indra/llui/llfloater.cpp | |
| parent | 6cce8629b962cd73515e2d0a85620b602e57a0fe (diff) | |
| parent | f9dc6d9708523591eb95b4ec79c62270ed2ecb93 (diff) | |
Pull from viewer-fbc
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index d97569839a..db9b6b78d2 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1335,7 +1335,7 @@ void LLFloater::setFocus( BOOL b ) { return; } - LLUICtrl* last_focus = gFocusMgr.getLastFocusForGroup(this); + LLView* last_focus = gFocusMgr.getLastFocusForGroup(this); // a descendent already has focus BOOL child_had_focus = hasFocus(); |