livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

master
MaximB ProductEngine 2012-12-10 22:48:12 +02:00
parent f49d47b304 08a7f4193b
commit 0e4c3070cb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloaterimcontainer.cpp
View File

@ -935,7 +935,10 @@ void LLFloaterIMContainer::doToParticipants(const std::string& command, uuid_vec
}
else if ("im" == command)
{
LLAvatarActions::startIM(userID);
if (gAgent.getID() != userID)
{
LLAvatarActions::startIM(userID);
}
}
else if ("offer_teleport" == command)
{