From a87e38229921b48c32187c672a942516722f1b52 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 11 Jan 2009 16:10:39 -0600
Subject: Second Life viewer sources 1.22.5-RC

---
 linden/indra/newview/llimview.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/llimview.h')

diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index 9046a2e..d28d00a 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
-- 
cgit v1.1


From 61f97b33f9850d21965d397b947a298c16ba576d Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 12 Feb 2009 02:06:41 -0600
Subject: Second Life viewer sources 1.22.8-RC

---
 linden/indra/newview/llimview.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llimview.h')

diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index d28d00a..6b82c2e 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -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
-- 
cgit v1.1