diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-15 15:42:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-15 15:42:21 -0400 |
| commit | a625dbe35ebaf63ad093aedce49a042ee790fe3c (patch) | |
| tree | f78e643bae9590262bce94681376254436140e2c /indra/llui/llfloater.cpp | |
| parent | 75722baf295aff7927bff3c70cdf0ec27399cb37 (diff) | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
merge changes for 3.5.0-beta3
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) |