summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-06-29 16:09:08 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-06-29 16:09:08 -0400
commit125b789239b5adb5f810b3586a95f5d5f8a17c40 (patch)
tree9650173fc466d363a9092722d04456c15b078f8d /indra/newview/llviewermedia.cpp
parent17d2a3b9fb24ea56eb5e70007a2502bbef436a65 (diff)
parent33065ed28835f17aed22bd0d5f742bc5bb76e1a4 (diff)
merge
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp2
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();