diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/llmedia/llmediamanager.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/llmedia/llmediamanager.cpp')
-rw-r--r-- | linden/indra/llmedia/llmediamanager.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -150,8 +151,10 @@ LLMediaManager* LLMediaManager::getInstance() | |||
150 | // (static) | 151 | // (static) |
151 | void LLMediaManager::setBrowserUserAgent(std::string user_agent) | 152 | void LLMediaManager::setBrowserUserAgent(std::string user_agent) |
152 | { | 153 | { |
154 | #if LL_LLMOZLIB_ENABLED | ||
153 | // *HACK: Breaks encapsulation model, as initClass does above. JC | 155 | // *HACK: Breaks encapsulation model, as initClass does above. JC |
154 | LLMediaImplLLMozLib::setBrowserUserAgent(user_agent); | 156 | LLMediaImplLLMozLib::setBrowserUserAgent(user_agent); |
157 | #endif // LL_LLMOZLIB_ENABLED | ||
155 | } | 158 | } |
156 | 159 | ||
157 | //////////////////////////////////////////////////////////////////////////////// | 160 | //////////////////////////////////////////////////////////////////////////////// |