aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterchatterbox.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterchatterbox.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterchatterbox.h b/linden/indra/newview/llfloaterchatterbox.h
index 1d17113..185cea3 100644
--- a/linden/indra/newview/llfloaterchatterbox.h
+++ b/linden/indra/newview/llfloaterchatterbox.h
@@ -14,12 +14,12 @@
14 * ("GPL"), unless you have obtained a separate licensing agreement 14 * ("GPL"), unless you have obtained a separate licensing agreement
15 * ("Other License"), formally executed by you and Linden Lab. Terms of 15 * ("Other License"), formally executed by you and Linden Lab. Terms of
16 * the GPL can be found in doc/GPL-license.txt in this distribution, or 16 * the GPL can be found in doc/GPL-license.txt in this distribution, or
17 * online at http://secondlife.com/developers/opensource/gplv2 17 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
18 * 18 *
19 * There are special exceptions to the terms and conditions of the GPL as 19 * There are special exceptions to the terms and conditions of the GPL as
20 * it is applied to this Source Code. View the full text of the exception 20 * it is applied to this Source Code. View the full text of the exception
21 * in the file doc/FLOSS-exception.txt in this software distribution, or 21 * in the file doc/FLOSS-exception.txt in this software distribution, or
22 * online at http://secondlife.com/developers/opensource/flossexception 22 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
23 * 23 *
24 * By copying, modifying or distributing this software, you acknowledge 24 * By copying, modifying or distributing this software, you acknowledge
25 * that you have read and understood your obligations described above, 25 * that you have read and understood your obligations described above,
@@ -50,7 +50,7 @@ public:
50 void onClose(bool app_quitting); 50 void onClose(bool app_quitting);
51 51
52 // override LLUISingleton behavior 52 // override LLUISingleton behavior
53 static LLFloaterMyFriends* showInstance(const LLSD& id); 53 static LLFloaterMyFriends* showInstance(const LLSD& id = LLSD());
54 static void hideInstance(const LLSD& id); 54 static void hideInstance(const LLSD& id);
55 static BOOL instanceVisible(const LLSD& id); 55 static BOOL instanceVisible(const LLSD& id);
56 56
@@ -77,7 +77,7 @@ public:
77 BOOL select_added_floater, 77 BOOL select_added_floater,
78 LLTabContainerCommon::eInsertionPoint insertion_point = LLTabContainerCommon::END); 78 LLTabContainerCommon::eInsertionPoint insertion_point = LLTabContainerCommon::END);
79 79
80 static LLFloaterChatterBox* showInstance(const LLSD& seed); 80 static LLFloaterChatterBox* showInstance(const LLSD& seed = LLSD());
81 static BOOL instanceVisible(const LLSD& seed); 81 static BOOL instanceVisible(const LLSD& seed);
82 82
83 static LLFloater* getCurrentVoiceFloater(); 83 static LLFloater* getCurrentVoiceFloater();