Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final OpenSim group chat fix... i HOPE

Browse Source
This commit is contained in:
Siana Gearz
2011-04-04 02:48:05 +02:00
parent cd7b1e434d
commit c17b67399b
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llimpanel.cpp
View File

@@ -1108,6 +1108,11 @@ LLFloaterIMPanel::LLFloaterIMPanel(
mFirstKeystrokeTimer(), mFirstKeystrokeTimer(),
mLastKeystrokeTimer() mLastKeystrokeTimer()
{ {
if(mOtherParticipantUUID.isNull())
{
llwarns << "Other participant is NULL" << llendl;
}
// [Ansariel: Display name support] // [Ansariel: Display name support]
sFloaterIMPanels.insert(this); sFloaterIMPanels.insert(this);
// [/Ansariel: Display name support] // [/Ansariel: Display name support]
@@ -1144,6 +1149,11 @@ LLFloaterIMPanel::LLFloaterIMPanel(
mFirstKeystrokeTimer(), mFirstKeystrokeTimer(),
mLastKeystrokeTimer() mLastKeystrokeTimer()
{ {
if(mOtherParticipantUUID.isNull())
{
llwarns << "Other participant is NULL" << llendl;
}
// [Ansariel: Display name support] // [Ansariel: Display name support]
sFloaterIMPanels.insert(this); sFloaterIMPanels.insert(this);
// [/Ansariel: Display name support] // [/Ansariel: Display name support]

19
indra/newview/llimview.cpp
View File

@@ -578,13 +578,6 @@ void LLIMMgr::addMessage(
other_participant_id = LLUUID::null; other_participant_id = LLUUID::null;
} }
//This is for InWorldz glitch.
if( other_participant_id == session_id )
{
other_participant_id = LLUUID::null;
}
LLFloaterIMPanel* floater; LLFloaterIMPanel* floater;
LLUUID new_session_id = session_id; LLUUID new_session_id = session_id;
if (new_session_id.isNull()) if (new_session_id.isNull())
@@ -679,7 +672,17 @@ void LLIMMgr::addMessage(
} }
else 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()); LLFloaterChatterBox* chat_floater = LLFloaterChatterBox::getInstance(LLSD());