From ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 30 Apr 2009 13:04:20 -0500
Subject: Second Life viewer sources 1.23.0-RC

---
 linden/indra/llmedia/llmediamanager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'linden/indra/llmedia/llmediamanager.cpp')

diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index 6db8dbe..e1c7608 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -150,8 +151,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 // LL_LLMOZLIB_ENABLED
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.1