Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

1 files changed, 5 insertions, 3 deletions

diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index 9046a2e..6b82c2e 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -97,7 +97,8 @@ public:
         // Creates a P2P session with the requisite handle for responding to voice calls
         LLUUID addP2PSession(const std::string& name,
                                           const LLUUID& other_participant_id,
-                                          const std::string& voice_session_handle);
+                                          const std::string& voice_session_handle,
+                                          const std::string& caller_uri = LLStringUtil::null);
 
         // This removes the panel referenced by the uuid, and then
         // restores internal consistency. The internal pointer is not
@@ -111,7 +112,8 @@ public:
                 const std::string& caller_name,
                 EInstantMessage type,
                 EInvitationType inv_type, 
-                const std::string& session_handle = LLStringUtil::null);
+                const std::string& session_handle = LLStringUtil::null,
+                const std::string& session_uri = LLStringUtil::null);
 
         //Updates a given session's session IDs.  Does not open,
         //create or do anything new.  If the old session doesn't