diff options
| author | Richard Linden <none@none> | 2012-01-18 13:36:00 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-18 13:36:00 -0800 |
| commit | b1d28300fbd37edfb4093b13ea0d243e45d6952b (patch) | |
| tree | 7ac2d8ee751b492f0aca2df92aa40f6d55bed1e6 /indra/llui/llfloater.cpp | |
| parent | 28fc3cbadb2b4d46b87938b74d61d5537f6c9701 (diff) | |
| parent | b75f495526b29fff826fa8bd4e89be7ddf6b2aee (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; } } |