diff options
| author | Richard Linden <none@none> | 2012-01-19 19:44:15 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-19 19:44:15 -0800 |
| commit | 4fa9f2892b7a9967f9e97228c17e7b277fc56aae (patch) | |
| tree | c7e330b71e4d5127902f9b4fc5fbeabadf021a15 /indra/llui/llfloater.cpp | |
| parent | 9de0b5ed4891dcfcb54e35d9bb0401309455d66a (diff) | |
| parent | 19320842ebc39c1b528a2107323f9e918d688177 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 33548151fd..cedc4c0aee 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1681,6 +1681,8 @@ LLFloater* LLFloater::getClosableFloaterFromFocus() { if (it->hasFocus()) { + LLFloater& floater = *it; + focused_floater = &floater; break; } } |