2 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 51a5bca..5d6a648 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -428,7 +428,7 @@ unload ()
 
         if (mediaData)
         {
-                delete mediaData;
+                delete [] mediaData;
                 mediaData = NULL;
         }
 
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index f72e63c..16c731f 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -150,8 +150,10 @@ LLMediaManager* LLMediaManager::getInstance()
 // (static)
 void LLMediaManager::setBrowserUserAgent(std::string user_agent)
 {
+#if LL_LLMOZLIB_ENABLED
         // *HACK: Breaks encapsulation model, as initClass does above. JC
         LLMediaImplLLMozLib::setBrowserUserAgent(user_agent);
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////