diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-10 22:48:12 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-10 22:48:12 +0200 |
| commit | 0e4c3070cb6cfb389d708ca459ed2c721c1cc28a (patch) | |
| tree | 5e0f3533784b2e173bfaa4ae0ae52d0bccbb4d2f /indra | |
| parent | f49d47b3041c6b36b36a23b67eec609e95494acc (diff) | |
| parent | 08a7f4193b18ca5c0bbaf144232eeb2678205eae (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index e900f583b3..a76714950d 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -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) { |