From 7b2b36ec7813ba7536b1d2940e993c8d86fc99f9 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 26 Feb 2010 10:08:03 +0200
Subject: =?UTF-8?q?fixed=20major=20EXT-5746=20=E2=80=9CVoice=20notificatio?=
 =?UTF-8?q?ns=20appear=20undocked=20in=20the=20top=20left=20corner=20of=20?=
 =?UTF-8?q?viewport=E2=80=9D,=20made=20LLCallFloater=20and=20LLCallDialog?=
 =?UTF-8?q?=20force=20docked=20state=20when=20created;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/llimview.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index faddffe0fc..e87399abab 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1473,6 +1473,8 @@ LLCallDialog::LLCallDialog(const LLSD& payload)
 	  mLifetime(DEFAULT_LIFETIME)
 {
 	setAutoFocus(FALSE);
+	// force docked state since this floater doesn't save it between recreations
+	setDocked(true);
 }
 
 void LLCallDialog::getAllowedRect(LLRect& rect)
-- 
cgit v1.2.3


From 5351688b9d102576513bac45b427d5228764eb0b Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Mon, 1 Mar 2010 15:32:22 +0200
Subject: fix for major EXT-5694 Only first recepient from ad-hoc conference is
 added to recent speakers

--HG--
branch : product-engine
---
 indra/newview/llimview.cpp | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index e87399abab..1dc601e260 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -952,7 +952,42 @@ void LLIMModel::sendMessage(const std::string& utf8_text,
 	}
 
 	// Add the recipient to the recent people list.
-	LLRecentPeople::instance().add(other_participant_id);
+	bool is_not_group_id = LLGroupMgr::getInstance()->getGroupData(other_participant_id) == NULL;
+
+	if (is_not_group_id)
+	{
+			
+#if 0
+		//use this code to add only online members	
+		LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(im_session_id);
+		LLSpeakerMgr::speaker_list_t speaker_list;
+		speaker_mgr->getSpeakerList(&speaker_list, true);
+		for(LLSpeakerMgr::speaker_list_t::iterator it = speaker_list.begin(); it != speaker_list.end(); it++)
+		{
+			const LLPointer<LLSpeaker>& speakerp = *it;
+
+			LLRecentPeople::instance().add(speakerp->mID);
+		}
+#else
+		LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(im_session_id);
+		if( session == 0)//??? shouldn't really happen
+		{
+			LLRecentPeople::instance().add(other_participant_id);
+		}
+		else
+		{
+			for(std::vector<LLUUID>::iterator it = session->mInitialTargetIDs.begin();
+				it!=session->mInitialTargetIDs.end();++it)
+			{
+				const LLUUID id = *it;
+
+				LLRecentPeople::instance().add(id);
+			}
+		}
+#endif
+	}
+
+	
 }
 
 void session_starter_helper(
-- 
cgit v1.2.3