diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-06-17 11:12:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-06-17 11:12:27 -0700 |
| commit | c4c8debfc230b4ec6d28c7a84cd2a9bb81d6c894 (patch) | |
| tree | d01f663d3fc1562d773a229e943addb02d14089f /indra/llui/llfloater.cpp | |
| parent | 51865f4e94885471dba0402b33f0b11b72bbdb30 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rwxr-xr-x | 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 62c923f6f0..3dbc9a5902 100755 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1634,7 +1634,7 @@ void LLFloater::bringToFront( S32 x, S32 y ) // virtual -void LLFloater::setVisibleAndFrontmost(BOOL take_focus, const LLSD& key) +void LLFloater::setVisibleAndFrontmost(BOOL take_focus,const LLSD& key) { LLMultiFloater* hostp = getHost(); if (hostp) |