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

Merge branch 'master' of git://github.com/siana/SingularityViewer

Browse Source
This commit is contained in:
narv
2011-04-04 10:23:26 -07:00
parent 284a9c4366 c17b67399b
commit ff78e24ee3
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(),
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]

19
indra/newview/llimview.cpp
View File

@@ -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());