From d6363c6c7ad32ecd12ca0bae849505a6181fb9e2 Mon Sep 17 00:00:00 2001
From: Monroe Linden <monroe@lindenlab.com>
Date: Fri, 30 Oct 2009 14:07:23 -0700
Subject: Fixed a couple problems with getPriorityList().
---
indra/newview/llviewermedia.cpp | 2 +-
indra/newview/llviewermedia.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 92022441b7..f9e09036a8 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -442,7 +442,7 @@ bool LLViewerMedia::getInWorldMediaDisabled()
return sInWorldMediaDisabled;
}
-const LLViewerMedia::impl_list &getPriorityList()
+LLViewerMedia::impl_list &LLViewerMedia::getPriorityList()
{
return sViewerMediaImplList;
}
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index f997dc8c0e..1a4d2cd3c6 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -106,7 +106,7 @@ class LLViewerMedia
static bool getInWorldMediaDisabled();
// Returns the priority-sorted list of all media impls.
- static const impl_list &getPriorityList();
+ static impl_list &getPriorityList();
// This is the comparitor used to sort the list.
static bool priorityComparitor(const LLViewerMediaImpl* i1, const LLViewerMediaImpl* i2);
--
cgit v1.2.3