diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-03-23 12:26:49 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-03-23 12:26:49 +0200 |
| commit | da4f6a481ad4153280f1b27d41f0291acc073dfa (patch) | |
| tree | 647283cfa7172937790b52b0650f8603710918ac /indra | |
| parent | bcf959f97cbec3f394bd1ca8f07fb742d09b0614 (diff) | |
| parent | dc3c0c601693b9f4e35739a48af2c4bf0bffaeb8 (diff) | |
Merge after wrong push to default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelpicks.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 0a7c39db46..4ac57bc7a4 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -288,7 +288,8 @@ void LLPanelPicks::processProperties(void* data, EAvatarProcessorType type) LLAvatarClassifieds* c_info = static_cast<LLAvatarClassifieds*>(data); if(c_info && getAvatarId() == c_info->target_id) { - mClassifiedsList->clear(); + // do not clear classified list in case we will receive two or more data packets. + // list has been cleared in updateData(). (fix for EXT-6436) LLAvatarClassifieds::classifieds_list_t::const_iterator it = c_info->classifieds_list.begin(); for(; c_info->classifieds_list.end() != it; ++it) |