diff options
| author | Richard Linden <none@none> | 2012-01-18 14:43:38 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-18 14:43:38 -0800 |
| commit | 9f28dedc85b20e46338232a4aa91903bd6744ce1 (patch) | |
| tree | 064f4337ae6d4245b641e18803395eb589da8185 /indra/llui | |
| parent | 2c2ada26fe215e8f0a518f9aec30aa480d5ebbc6 (diff) | |
| parent | a1b200878fdc517252506a19f71432ab956086c2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/llui')
| -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; } } |