diff options
| author | merov <none@none> | 2013-03-11 21:34:39 -0700 |
|---|---|---|
| committer | merov <none@none> | 2013-03-11 21:34:39 -0700 |
| commit | 130c11c9fe9edc315229f30c338698f0463d0ee4 (patch) | |
| tree | 295a3492c69214e8bad4b29cba1bee01be5955b1 /indra/llui/llfloater.h | |
| parent | ac63601a2aeb05f67d6be87d7ad40495bbc3080b (diff) | |
| parent | 317476de8f33388e60348138f0f440f3949639d1 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 2 |
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; } |