diff options
| author | Jacek Antonelli | 2008-12-06 21:00:15 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-06 21:00:15 -0600 |
| commit | e23dcb6417910fa2073d0c4492732d04324f8c8f (patch) | |
| tree | bdede6646e160d9423899fda63d71c985eb0d294 /linden/indra/llmedia/llmediamanager.cpp | |
| parent | Read filter labels from XML, no hard-coding. (diff) | |
| parent | Added banners in ChangeLog to set versions apart. (diff) | |
| download | meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.zip meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.tar.gz meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.tar.bz2 meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.tar.xz | |
Merge RC2 into quickfilter
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llmedia/llmediamanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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() | |||
| 150 | // (static) | 150 | // (static) |
| 151 | void LLMediaManager::setBrowserUserAgent(std::string user_agent) | 151 | void LLMediaManager::setBrowserUserAgent(std::string user_agent) |
| 152 | { | 152 | { |
| 153 | #if LL_LLMOZLIB_ENABLED | ||
| 153 | // *HACK: Breaks encapsulation model, as initClass does above. JC | 154 | // *HACK: Breaks encapsulation model, as initClass does above. JC |
| 154 | LLMediaImplLLMozLib::setBrowserUserAgent(user_agent); | 155 | LLMediaImplLLMozLib::setBrowserUserAgent(user_agent); |
| 156 | #endif | ||
| 155 | } | 157 | } |
| 156 | 158 | ||
| 157 | //////////////////////////////////////////////////////////////////////////////// | 159 | //////////////////////////////////////////////////////////////////////////////// |