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

3 files changed, 5 insertions, 15 deletions

diff --git a/linden/indra/test/lltemplatemessagebuilder_tut.cpp b/linden/indra/test/lltemplatemessagebuilder_tut.cpp
index 5b33d02..9fecc2f 100644
--- a/linden/indra/test/lltemplatemessagebuilder_tut.cpp
+++ b/linden/indra/test/lltemplatemessagebuilder_tut.cpp
@@ -35,7 +35,6 @@
 #include "linden_common.h"
 #include "lltut.h"
 
-#include "llapr.h"
 #include "llmessagetemplate.h"
 #include "llquaternion.h"
 #include "lltemplatemessagebuilder.h"
@@ -59,7 +58,6 @@ namespace tut
                         static bool init = false;
                         if(! init)
                         {
-                                ll_init_apr();
                                 const F32 circuit_heartbeat_interval=5;
                                 const F32 circuit_timeout=100;
 
diff --git a/linden/indra/test/message_tut.cpp b/linden/indra/test/message_tut.cpp
index 3fede26..694db52 100644
--- a/linden/indra/test/message_tut.cpp
+++ b/linden/indra/test/message_tut.cpp
@@ -35,7 +35,6 @@
 #include "linden_common.h"
 #include "lltut.h"
 
-#include "llapr.h"
 #include "llmessageconfig.h"
 #include "llsdserialize.h"
 #include "llversionserver.h"
@@ -68,7 +67,6 @@ namespace tut
                         static bool init = false;
                         if(!init)
                         {
-                                ll_init_apr();
                                 //init_prehash_data();
                                 init = true;
                         }
diff --git a/linden/indra/test/test.cpp b/linden/indra/test/test.cpp
index ba81c6e..b699f74 100644
--- a/linden/indra/test/test.cpp
+++ b/linden/indra/test/test.cpp
@@ -43,8 +43,8 @@
 #include "linden_common.h"
 #include "llerrorcontrol.h"
 #include "lltut.h"
+#include "aiaprpool.h"
 
-#include "apr_pools.h"
 #include "apr_getopt.h"
 
 // the CTYPE_WORKAROUND is needed for linux dev stations that don't
@@ -248,17 +248,12 @@ int main(int argc, char **argv)
         ctype_workaround();
 #endif
 
-        apr_initialize();
-        apr_pool_t* pool = NULL;
-        if(APR_SUCCESS != apr_pool_create(&pool, NULL))
-        {
-                std::cerr << "Unable to initialize pool" << std::endl;
-                return 1;
-        }
+        LLAPRPool pool;
+        pool.create();
         apr_getopt_t* os = NULL;
-        if(APR_SUCCESS != apr_getopt_init(&os, pool, argc, argv))
+        if(APR_SUCCESS != apr_getopt_init(&os, pool(), argc, argv))
         {
-                std::cerr << "Unable to  pool" << std::endl;
+                std::cerr << "Unable to initialize the arguments for parsing by apr_getopt()." << std::endl;
                 return 1;
         }
 
@@ -360,6 +355,5 @@ int main(int argc, char **argv)
                 s.close();
         }
         
-        apr_terminate();
         return 0;
 }