summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-01-21 15:23:09 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-01-21 15:23:09 -0800
commit6a686700d0f51c02facb645208b7e21aa9b687d9 (patch)
treed339ab2764d6b96d23531e70f03b13076ebc6278 /indra
parentaa68e0fd302bd91b7387bafa1ba19412ec98af4e (diff)
Minor cleanup to the logic in LLViewerParcelMedia::play(), to prevent duplication of code.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerparcelmedia.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index e8b435fc8f..e87dbe5c07 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -212,22 +212,15 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
else
{
// Since the texture id is different, we need to generate a new impl
- 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 = NULL;
-
- sMediaImpl = LLViewerMedia::newMediaImpl(
- placeholder_texture_id,
- media_width,
- media_height,
- media_auto_scale,
- media_loop);
- sMediaImpl->setIsParcelMedia(true);
- sMediaImpl->navigateTo(media_url, mime_type, true);
+
+ // A new impl will be created below.
}
}
- else
+
+ if(!sMediaImpl)
{
LL_DEBUGS("Media") << "new media impl with mime type " << mime_type << ", url " << media_url << LL_ENDL;