From c17b67399bd6b0bd328a54b57cac5a88798033de Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 4 Apr 2011 02:48:05 +0200
Subject: [PATCH] Final OpenSim group chat fix... i HOPE

---
 indra/newview/llimpanel.cpp | 10 ++++++++++
 indra/newview/llimview.cpp  | 19 +++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 821b64a3a..5476db1e2 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1108,6 +1108,11 @@ LLFloaterIMPanel::LLFloaterIMPanel(
 	mFirstKeystrokeTimer(),
 	mLastKeystrokeTimer()
 {
+	if(mOtherParticipantUUID.isNull()) 
+	{
+		llwarns << "Other participant is NULL" << llendl;
+	}
+		
     // [Ansariel: Display name support]
     sFloaterIMPanels.insert(this);
     // [/Ansariel: Display name support]
@@ -1144,6 +1149,11 @@ LLFloaterIMPanel::LLFloaterIMPanel(
 	mFirstKeystrokeTimer(),
 	mLastKeystrokeTimer()
 {
+	if(mOtherParticipantUUID.isNull()) 
+	{
+		llwarns << "Other participant is NULL" << llendl;
+	}
+	
     // [Ansariel: Display name support]
     sFloaterIMPanels.insert(this);
     // [/Ansariel: Display name support]
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index b1e7dd664..d96aa3bbc 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -578,13 +578,6 @@ void LLIMMgr::addMessage(
 		other_participant_id = LLUUID::null;
 	}
 
-	//This is for InWorldz glitch.
-	if( other_participant_id == session_id )
-	{
-		other_participant_id = LLUUID::null;
-	}
-	
-
 	LLFloaterIMPanel* floater;
 	LLUUID new_session_id = session_id;
 	if (new_session_id.isNull())
@@ -679,7 +672,17 @@ void LLIMMgr::addMessage(
 	}
 	else
 	{
-		floater->addHistoryLine(msg, color, true, other_participant_id, from); // Insert linked name to front of message
+		
+		if( other_participant_id == session_id )
+		{
+			// The name can be bogus on InWorldz
+			floater->addHistoryLine(msg, color, true, LLUUID::null, from);
+		}
+		else 
+		{
+			// Insert linked name to front of message
+			floater->addHistoryLine(msg, color, true, other_participant_id, from);
+		}
 	}
 
 	LLFloaterChatterBox* chat_floater = LLFloaterChatterBox::getInstance(LLSD());