diff options
| author | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-23 16:11:35 -0800 |
|---|---|---|
| committer | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-23 16:11:35 -0800 |
| commit | f39d4e98a73d5e13ce06f6188bf2d60d2db5d085 (patch) | |
| tree | b39781e1fcbcc57139b395934594158102773c3b /indra/newview/llviewerparcelmedia.cpp | |
| parent | 58eab5547fcd5f665c5254f31afd778797e5c84c (diff) | |
| parent | c9a1d3040e4ec8fde7bc1d69ea0509f0f7d288a1 (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; } |