summaryrefslogtreecommitdiff
path: root/indra/test_apps/llplugintest/llmediaplugintest.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-08-31 11:15:02 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-08-31 11:15:02 -0600
commit1379188c82a49617782288a61f1c3908d8738a3e (patch)
tree8a0c020aa8f6ab9ab2b62bfff01cd67e9c34bd32 /indra/test_apps/llplugintest/llmediaplugintest.cpp
parente62a4d4ec151e81f4dc68b29a009596d3d154d57 (diff)
parente547c36e2562589c120bb23ee88308e21a826cd1 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/test_apps/llplugintest/llmediaplugintest.cpp')
-rw-r--r--indra/test_apps/llplugintest/llmediaplugintest.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp
index 884b00f0cc..d5ee09c5bc 100644
--- a/indra/test_apps/llplugintest/llmediaplugintest.cpp
+++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp
@@ -27,7 +27,6 @@
#include "linden_common.h"
#include "indra_constants.h"
-#include "llapr.h"
#include "llerrorcontrol.h"
#include <math.h>
@@ -186,9 +185,6 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
std::cout << "Unable to read bookmarks from file: " << bookmarks_filename << std::endl;
};
- // initialize linden lab APR module
- ll_init_apr();
-
// Set up llerror logging
{
LLError::initForApplication(".");