Second Life viewer sources 1.19.0.0

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 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -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();