diff options
| author | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-20 17:53:51 -0500 |
|---|---|---|
| committer | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-20 17:53:51 -0500 |
| commit | f2948cb1eb8866716a84868cccbfafcd742c0771 (patch) | |
| tree | 394df20f229f87428252c02d2402c511b9fa7aa8 /indra/newview/llavataractions.cpp | |
| parent | 779e132cbfc46a0eda97a0331e39cbc6e686c07b (diff) | |
| parent | 4a2fb4c64f2079089b78202e53bbe1dbe8ac09c7 (diff) | |
Merge with viewer-chui
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index ce063a9887..b513a52ff7 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -193,7 +193,7 @@ static void on_avatar_name_cache_start_im(const LLUUID& agent_id, // static void LLAvatarActions::startIM(const LLUUID& id) { - if (id.isNull()) + if (id.isNull() || gAgent.getID() == id) return; LLAvatarNameCache::get(id, boost::bind(&on_avatar_name_cache_start_im, _1, _2)); |