diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-03-04 14:33:25 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-03-04 14:33:25 -0800 |
| commit | 88cf648176f9ce8214516f4d81d8d1cd55cede2f (patch) | |
| tree | 9aac41a6c360fe826aaef02cbfd284e06f9b5770 /indra/newview/llviewermedia.cpp | |
| parent | 34c8f6f7fa728c139a0da0deaccf6fda3d228680 (diff) | |
| parent | 14579a1ccab2817b019a61ffe1ac6b5edc3eb146 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 4c09b7cf3e..8acd343cf5 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -700,9 +700,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg) impl_list::iterator iter = sViewerMediaImplList.begin(); impl_list::iterator end = sViewerMediaImplList.end(); - for(; iter != end; iter++) + for(; iter != end;) { - LLViewerMediaImpl* pimpl = *iter; + LLViewerMediaImpl* pimpl = *iter++; pimpl->update(); pimpl->calculateInterest(); } |