diff options
| author | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
| commit | 4ead03acd094d8418f9fe0f883e776ce8b209722 (patch) | |
| tree | 1ae53248e9a643c9f27333aabc31ff0291e59b45 /indra/newview/llparticipantlist.cpp | |
| parent | ec32310c8602bf4dc69ed27e8c177cbd32c24411 (diff) | |
| parent | 81192236ac44ea500ea6ec6f8de32be11e9165ca (diff) | |
merge to viewer-2-0
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), |