diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-25 19:06:24 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-25 19:06:24 +0100 |
| commit | daabe1fb133d69df938bb58d12f0be26bdc16ead (patch) | |
| tree | c5e66f6859593137c5d58c8b05667f97e0ca5dc9 /indra/newview/llviewermedia.h | |
| parent | c22da3a2a9c4e2fa1e0b0b0c544f5933e91c6369 (diff) | |
| parent | 1596b01df60a00f9957885943ba7652dd4adce39 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 8626f4469e..ef9c07c6c7 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -84,7 +84,7 @@ public: static const char* SHOW_MEDIA_WITHIN_PARCEL_SETTING; static const char* SHOW_MEDIA_OUTSIDE_PARCEL_SETTING; - typedef std::vector<LLViewerMediaImpl*> impl_list; + typedef std::list<LLViewerMediaImpl*> impl_list; typedef std::map<LLUUID, LLViewerMediaImpl*> impl_id_map; |