diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-12 07:39:00 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-12 07:39:00 +0200 |
| commit | cca679e0d66caf0aa49a77a89f821f923d4ead59 (patch) | |
| tree | 84d8e15d3422849305c65774b823758e56d7d085 /indra/llui/llfloater.cpp | |
| parent | 40f61ae60091909bae8229b7d0496154a87fefbf (diff) | |
| parent | 130c11c9fe9edc315229f30c338698f0463d0ee4 (diff) | |
merge
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) |