diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-11 09:22:56 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-11 09:22:56 -0500 |
| commit | fc22e2cf5bfc97caaf1ad69814b7dd217cbafef0 (patch) | |
| tree | 8ac101cbfb2b3a47dff9cc4b33b95013feba3c66 /indra/newview/llchathistory.cpp | |
| parent | 024e5ff23542cf0604b73901311bb4d024957b1c (diff) | |
| parent | ee8df375449e97476408417ec6dea0d6a8853d73 (diff) | |
merge fix for STORM-559
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 3dc6e786d3..0f7e9313a9 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -335,7 +335,7 @@ public: LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon"); - if(mSourceType != CHAT_SOURCE_AGENT) + if(mSourceType != CHAT_SOURCE_AGENT || mAvatarID.isNull()) icon->setDrawTooltip(false); switch (mSourceType) |