diff options
| author | prep <prep@lindenlab.com> | 2013-03-21 11:21:45 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-21 11:21:45 -0400 |
| commit | f3457461617119bda93f506977170cb8f15a270d (patch) | |
| tree | d4b9e45586725447ef939b6876c7d19d7ff9f573 /indra/llui/llfloater.cpp | |
| parent | 33954bbbe5517a0ad72ffc6bad7cb94985b3bf8b (diff) | |
| parent | f2948cb1eb8866716a84868cccbfafcd742c0771 (diff) | |
Folded in changes from sunshine-stable
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | 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 27dd7f5b32..09e27a264a 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1621,7 +1621,7 @@ void LLFloater::bringToFront( S32 x, S32 y ) // virtual -void LLFloater::setVisibleAndFrontmost(BOOL take_focus) +void LLFloater::setVisibleAndFrontmost(BOOL take_focus, const LLSD& key) { LLMultiFloater* hostp = getHost(); if (hostp) |