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/newview/llfloaterimnearbychat.h | |
parent | 75722baf295aff7927bff3c70cdf0ec27399cb37 (diff) | |
parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) |
merge changes for 3.5.0-beta3
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.h')
-rw-r--r-- | indra/newview/llfloaterimnearbychat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimnearbychat.h b/indra/newview/llfloaterimnearbychat.h index 4ad37eb0c7..05b48cccb0 100644 --- a/indra/newview/llfloaterimnearbychat.h +++ b/indra/newview/llfloaterimnearbychat.h @@ -54,6 +54,7 @@ public: /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ void onClose(bool app_quitting); /*virtual*/ void setVisible(BOOL visible); + /*virtual*/ void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD()); /*virtual*/ void closeHostedFloater(); void loadHistory(); |