Merge branch 'weekly' into branding

Conflicts (solved):
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llappviewerwin32.cpp

1 files changed, 0 insertions, 13 deletions

diff --git a/linden/indra/llcommon/llcommon.cpp b/linden/indra/llcommon/llcommon.cpp
index 2cbb718..298dd46 100644
--- a/linden/indra/llcommon/llcommon.cpp
+++ b/linden/indra/llcommon/llcommon.cpp
@@ -35,17 +35,9 @@
 #include "llthread.h"
 
 //static
-BOOL LLCommon::sAprInitialized = FALSE;
-
-//static
 void LLCommon::initClass()
 {
         LLMemory::initClass();
-        if (!sAprInitialized)
-        {
-                ll_init_apr();
-                sAprInitialized = TRUE;
-        }
         LLTimer::initClass();
         LLThreadSafeRefCount::initThreadSafeRefCount();
 //      LLWorkerThread::initClass();
@@ -59,10 +51,5 @@ void LLCommon::cleanupClass()
 //      LLWorkerThread::cleanupClass();
         LLThreadSafeRefCount::cleanupThreadSafeRefCount();
         LLTimer::cleanupClass();
-        if (sAprInitialized)
-        {
-                ll_cleanup_apr();
-                sAprInitialized = FALSE;
-        }
         LLMemory::cleanupClass();
 }