diff options
| author | Jacek Antonelli | 2008-12-10 18:31:10 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-10 18:31:45 -0600 |
| commit | 38ce34139289dd2d90b42009c10505bd736b8cd2 (patch) | |
| tree | 26e71a5db9a9c1ab8d632cd5fbd1e6c879f5751c /linden/indra/llmedia | |
| parent | Updated audio engine to LL's openal branch r1532. (diff) | |
| parent | Added banners in ChangeLog to set versions apart. (diff) | |
| download | meta-impy-38ce34139289dd2d90b42009c10505bd736b8cd2.zip meta-impy-38ce34139289dd2d90b42009c10505bd736b8cd2.tar.gz meta-impy-38ce34139289dd2d90b42009c10505bd736b8cd2.tar.bz2 meta-impy-38ce34139289dd2d90b42009c10505bd736b8cd2.tar.xz | |
Merge 1.0.0 RC2 into openal
Diffstat (limited to 'linden/indra/llmedia')
| -rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.cpp | 2 | ||||
| -rw-r--r-- | linden/indra/llmedia/llmediamanager.cpp | 2 |
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 () | |||
| 428 | 428 | ||
| 429 | if (mediaData) | 429 | if (mediaData) |
| 430 | { | 430 | { |
| 431 | delete mediaData; | 431 | delete [] mediaData; |
| 432 | mediaData = NULL; | 432 | mediaData = NULL; |
| 433 | } | 433 | } |
| 434 | 434 | ||
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 | //////////////////////////////////////////////////////////////////////////////// |