diff options
author | Jacek Antonelli | 2008-11-30 13:39:21 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-11-30 13:39:21 -0600 |
commit | aff35cae3d5c3f0f4a2798498464914f3a922a91 (patch) | |
tree | bd8ca79c7e194475e2e635400e88a2b2ae7279af | |
parent | Fixed passing nonliteral strings to *printf functions. (diff) | |
download | meta-impy-aff35cae3d5c3f0f4a2798498464914f3a922a91.zip meta-impy-aff35cae3d5c3f0f4a2798498464914f3a922a91.tar.gz meta-impy-aff35cae3d5c3f0f4a2798498464914f3a922a91.tar.bz2 meta-impy-aff35cae3d5c3f0f4a2798498464914f3a922a91.tar.xz |
Disable llmozlib-dependent code when not available.
Patch by Stephen Zenith. [#12]
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/llmedia/llmediamanager.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 2e4f19b..6c7008c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,10 @@ | |||
1 | 2008-11-30 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2008-11-30 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/llmedia/llmediamanager.cpp: | ||
4 | Disable llmozlib-dependent code when not available. | ||
5 | Patch by Stephen Zenith. [#12] | ||
6 | |||
7 | |||
3 | * linden/indra/llwindow/llwindowsdl.cpp: | 8 | * linden/indra/llwindow/llwindowsdl.cpp: |
4 | Fixed passing nonliteral strings to *printf functions. | 9 | Fixed passing nonliteral strings to *printf functions. |
5 | gcc 4.3 rejects that as being unsafe. | 10 | gcc 4.3 rejects that as being unsafe. |
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 | //////////////////////////////////////////////////////////////////////////////// |