diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-12 19:40:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-12 19:40:00 -0700 |
| commit | c594e848656f2bc1d29c48b7ceae782b5d542ad2 (patch) | |
| tree | c668283967304a5e84e0b8d72a07511d5e842e2b /indra/newview/llavataractions.cpp | |
| parent | cb6574c905806feac3846733ca0ead77e431beb1 (diff) | |
| parent | e7a4cce3566988d5b58dc070196a32844d705318 (diff) | |
Pull merge from lindenlab/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)); |