diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-28 11:31:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-28 11:31:30 -0400 |
| commit | 621085d553cccc4238d74886ca44bcefafddd7f1 (patch) | |
| tree | 501a4726d0084e119691b397858420e6e202fa0d /indra/newview/llfloaterimcontainer.h | |
| parent | 716aef71c46ea3d33157d7007172d140040bd19c (diff) | |
| parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
merge changes for 3.5.0-beta6
Diffstat (limited to 'indra/newview/llfloaterimcontainer.h')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h index 2cbc1e99f9..52b672241f 100644 --- a/indra/newview/llfloaterimcontainer.h +++ b/indra/newview/llfloaterimcontainer.h @@ -60,6 +60,7 @@ public: /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ void draw(); /*virtual*/ void setVisible(BOOL visible); + /*virtual*/ void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD()); /*virtual*/ void updateResizeLimits(); void onCloseFloater(LLUUID& id); |