diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2007-12-19 00:56:59 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2007-12-19 00:56:59 +0000 |
| commit | 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c (patch) | |
| tree | 6195a8585cc7998647afcaec2167e728e4abd3c1 /indra/newview/llfloaterchatterbox.h | |
| parent | 4d87303e78c1accde85b217b325e0c08930b0c4c (diff) | |
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
Diffstat (limited to 'indra/newview/llfloaterchatterbox.h')
| -rw-r--r-- | indra/newview/llfloaterchatterbox.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterchatterbox.h b/indra/newview/llfloaterchatterbox.h index 34410935f2..bf06ee9d38 100644 --- a/indra/newview/llfloaterchatterbox.h +++ b/indra/newview/llfloaterchatterbox.h @@ -50,7 +50,7 @@ public: void onClose(bool app_quitting); // override LLUISingleton behavior - static LLFloaterMyFriends* showInstance(const LLSD& id); + static LLFloaterMyFriends* showInstance(const LLSD& id = LLSD()); static void hideInstance(const LLSD& id); static BOOL instanceVisible(const LLSD& id); @@ -77,7 +77,7 @@ public: BOOL select_added_floater, LLTabContainerCommon::eInsertionPoint insertion_point = LLTabContainerCommon::END); - static LLFloaterChatterBox* showInstance(const LLSD& seed); + static LLFloaterChatterBox* showInstance(const LLSD& seed = LLSD()); static BOOL instanceVisible(const LLSD& seed); static LLFloater* getCurrentVoiceFloater(); |