summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.h
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-03-21 11:21:45 -0400
committerprep <prep@lindenlab.com>2013-03-21 11:21:45 -0400
commitf3457461617119bda93f506977170cb8f15a270d (patch)
treed4b9e45586725447ef939b6876c7d19d7ff9f573 /indra/llui/llfloater.h
parent33954bbbe5517a0ad72ffc6bad7cb94985b3bf8b (diff)
parentf2948cb1eb8866716a84868cccbfafcd742c0771 (diff)
Folded in changes from sunshine-stable
Diffstat (limited to 'indra/llui/llfloater.h')
-rw-r--r--indra/llui/llfloater.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index cb5bf28db3..4dba1e645f 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -305,7 +305,7 @@ public:
/*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); // do not override
void setFrontmost(BOOL take_focus = TRUE);
- virtual void setVisibleAndFrontmost(BOOL take_focus=TRUE);
+ virtual void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD());
// Defaults to false.
virtual BOOL canSaveAs() const { return FALSE; }