diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-23 15:53:49 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-23 15:53:49 +0000 |
| commit | a434e32097ca59c19a7c38aeae6b1991272569df (patch) | |
| tree | 34237f1926aee21a80f977e5b363a7c0a8592b21 /indra/newview/llviewerparcelmedia.cpp | |
| parent | 21723e85677c69c4f78946d971bbf0e0c9cd37e5 (diff) | |
| parent | 1b07c1d7fb5b6d3ce15083bc3dbb65a3f0ac8006 (diff) | |
merge.
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 7559fd8e72..f61dbb1b39 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -218,7 +218,7 @@ void LLViewerParcelMedia::play(LLParcel* parcel) LL_DEBUGS("Media") << "new media impl with mime type " << mime_type << ", url " << media_url << LL_ENDL; // Delete the old one first so they don't fight over the texture. - sMediaImpl->stop(); + sMediaImpl = NULL; sMediaImpl = LLViewerMedia::newMediaImpl( placeholder_texture_id, @@ -261,8 +261,7 @@ void LLViewerParcelMedia::stop() // We need to remove the media HUD if it is up. LLViewerMediaFocus::getInstance()->clearFocus(); - // This will kill the media instance. - sMediaImpl->stop(); + // This will unload & kill the media instance. sMediaImpl = NULL; } |