diff options
| author | richard <none@none> | 2009-11-05 11:04:06 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-05 11:04:06 -0800 |
| commit | d3d5965d8af250f76e143addcfb68b17390f483c (patch) | |
| tree | 0f209c21c10fe775e582ce8a940a074af16dc458 /indra/newview/llparticipantlist.cpp | |
| parent | 535a98ce163e37b3bc495489923413701ea67995 (diff) | |
| parent | bbbacf1c4d06e7a0b4a5f532565410496a72963a (diff) | |
merge
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index edff706fee..32223e314e 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -42,6 +42,9 @@ #include "llspeakers.h" //LLParticipantList retrieves add, clear and remove events and updates view accordingly +#if LL_MSVC +#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally +#endif LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list): mSpeakerMgr(data_source), mAvatarList(avatar_list), |