summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimnearbychat.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-13 15:49:24 -0400
committerOz Linden <oz@lindenlab.com>2013-03-13 15:49:24 -0400
commite7639b614d5cce196f82c8bb2fb801b31471f28c (patch)
tree94b564c66c192efb85004e68409a91747d0bc572 /indra/newview/llfloaterimnearbychat.h
parent55b2383f51ffabf7e95595df5d576f383d458ee1 (diff)
parent680bea66dc2e7b08b71038be2261f9aad91f5658 (diff)
merge changes for DRTVWR-302
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.h')
-rw-r--r--indra/newview/llfloaterimnearbychat.h1
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();