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.cpp | |
parent | c22da3a2a9c4e2fa1e0b0b0c544f5933e91c6369 (diff) | |
parent | 1596b01df60a00f9957885943ba7652dd4adce39 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index d7190f26a3..34e30b3ccd 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -763,7 +763,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg) } // Sort the static instance list using our interest criteria - std::stable_sort(sViewerMediaImplList.begin(), sViewerMediaImplList.end(), priorityComparitor); + sViewerMediaImplList.sort(priorityComparitor); // Go through the list again and adjust according to priority. iter = sViewerMediaImplList.begin(); |