diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-08 21:46:36 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-08 21:46:36 -0800 |
| commit | c296a7eadab5a5d0e4406b0e4c1aa6d532bad9f2 (patch) | |
| tree | 1738716169c230f0b3be7e05897e1ac4e9e4bb84 /indra/newview/llfloaterimcontainer.h | |
| parent | 4ef1181cdcb03a08fbce8d774cd85ef914bef8f3 (diff) | |
| parent | b5172de28fd6bb8a833cf93180d2d43dd9d4a073 (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimcontainer.h')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h index 0cd1b6759b..85d950c58b 100644 --- a/indra/newview/llfloaterimcontainer.h +++ b/indra/newview/llfloaterimcontainer.h @@ -53,7 +53,7 @@ class LLFloaterIMContainer , public LLIMSessionObserver { public: - LLFloaterIMContainer(const LLSD& seed); + LLFloaterIMContainer(const LLSD& seed, const Params& params = getDefaultParams()); virtual ~LLFloaterIMContainer(); /*virtual*/ BOOL postBuild(); |