diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 17:50:32 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 17:50:32 -0800 |
| commit | 8c44fac93ffce1a41d84f1d6e98891a50ab1dbab (patch) | |
| tree | aca14bb3256b6dd4c1a7a342d36f2cc989159f41 /indra/newview/llparticipantlist.cpp | |
| parent | 1712265901da8ba65f2a9ae3e903372fafacd268 (diff) | |
| parent | e654475529d924603a9b3bc8c4775c86d3cf7933 (diff) | |
merge from remote repo
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), |