From 29b87b1cdcf0bc1a1f444da3fb693bfdc1ca7590 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Sun, 7 Jul 2013 08:51:37 -0500
Subject: [PATCH] Update typing indicator with selected name. Wire in function
 lost in merge.

---
 indra/newview/fsfloaterim.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp
index 5dbfab5677..2448a02b02 100644
--- a/indra/newview/fsfloaterim.cpp
+++ b/indra/newview/fsfloaterim.cpp
@@ -894,7 +894,15 @@ BOOL FSFloaterIM::postBuild()
 		mInputEditor->setEnabled(FALSE);
 		mInputEditor->setLabel(LLTrans::getString("IM_unavailable_text_label"));
 	}
-	else
+
+        if ( im_session && im_session->isP2PSessionType())
+        {
+                // look up display name for window title
+                LLAvatarNameCache::get(im_session->mOtherParticipantID,
+                                   boost::bind(&FSFloaterIM::onAvatarNameCache,
+                                                   this, _1, _2));
+        }
+        else
 	{
 		std::string session_name(LLIMModel::instance().getName(mSessionID));
 		updateSessionName(session_name, session_name);