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.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 21d8e1f..7839146 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -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.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

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

diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 7839146..10e8ff8 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -267,7 +267,8 @@ public:
 		EInstantMessage type,
 		EInvitationType inv_type,
 		const std::string& session_handle,
-		const std::string& notify_box) : 
+		const std::string& notify_box,
+		const std::string& session_uri) : 
 		mSessionID(session_id),
 		mSessionName(session_name),
 		mCallerID(caller_id),
@@ -275,7 +276,8 @@ public:
 		mType(type),
 		mInvType(inv_type),
 		mSessionHandle(session_handle),
-		mNotifyBox(notify_box)
+		mNotifyBox(notify_box),
+		mSessionURI(session_uri)
 	{};
 
 	LLUUID		mSessionID;
@@ -286,6 +288,7 @@ public:
 	EInvitationType mInvType;
 	std::string	mSessionHandle;
 	std::string	mNotifyBox;
+	std::string	mSessionURI;
 };
 
 
@@ -568,7 +571,8 @@ BOOL LLIMMgr::isIMSessionOpen(const LLUUID& uuid)
 
 LLUUID LLIMMgr::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)
 {
 	LLUUID session_id = addSession(name, IM_NOTHING_SPECIAL, other_participant_id);
 
@@ -576,7 +580,7 @@ LLUUID LLIMMgr::addP2PSession(const std::string& name,
 	if(floater)
 	{
 		LLVoiceChannelP2P* voice_channelp = (LLVoiceChannelP2P*)floater->getVoiceChannel();
-		voice_channelp->setSessionHandle(voice_session_handle);
+		voice_channelp->setSessionHandle(voice_session_handle, caller_uri);		
 	}
 
 	return session_id;
@@ -699,7 +703,8 @@ void LLIMMgr::inviteToSession(
 	const std::string& caller_name,
 	EInstantMessage type,
 	EInvitationType inv_type,
-	const std::string& session_handle)
+	const std::string& session_handle,
+	const std::string& session_uri)
 {
 	//ignore invites from muted residents
 	if (LLMuteList::getInstance()->isMuted(caller_id))
@@ -741,7 +746,8 @@ void LLIMMgr::inviteToSession(
 		type,
 		inv_type,
 		session_handle,
-		notify_box_type);
+		notify_box_type,
+		session_uri);
 	
 	LLVoiceChannel* channelp = LLVoiceChannel::getChannelByID(session_id);
 	if (channelp && channelp->callStarted())
@@ -916,7 +922,8 @@ void LLIMMgr::inviteUserResponse(S32 option, void* user_data)
 				invitep->mSessionID = gIMMgr->addP2PSession(
 					invitep->mSessionName,
 					invitep->mCallerID,
-					invitep->mSessionHandle);
+					invitep->mSessionHandle, 
+					invitep->mSessionURI );
 
 				LLFloaterIMPanel* im_floater =
 					gIMMgr->findFloaterBySession(
-- 
cgit v1.1