diff options
| author | Richard Linden <none@none> | 2012-01-23 17:50:15 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-23 17:50:15 -0800 |
| commit | ff5fe4ffc06fa9220043d82a2d7d7dbc0b7ffd77 (patch) | |
| tree | f6b31777ceb1a66c81aa7322687a9068fbd6a3b9 /indra/llui/llfloater.cpp | |
| parent | ea6cbc7b6b1de051a9bb1c311c4399a2b4d42cb3 (diff) | |
| parent | e09661f6ec467ea98715a2a04db40fc4e6b7ce02 (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; } } |