summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmedia.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
-rw-r--r--indra/newview/llviewerparcelmedia.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index 86d51bfd4b..a3f9c839a0 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -46,6 +46,7 @@
#include "llnotifications.h"
#include "llfirstuse.h"
#include "llpluginclassmedia.h"
+#include "llviewertexture.h"
// Static Variables
@@ -219,17 +220,25 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
// Delete the old one first so they don't fight over the texture.
sMediaImpl->stop();
- sMediaImpl = LLViewerMedia::newMediaImpl(media_url, placeholder_texture_id,
- media_width, media_height, media_auto_scale,
+ sMediaImpl = LLViewerMedia::newMediaImpl(
+ placeholder_texture_id,
+ media_width,
+ media_height,
+ media_auto_scale,
media_loop);
+ sMediaImpl->navigateTo(media_url);
}
}
else
{
// There is no media impl, make a new one
- sMediaImpl = LLViewerMedia::newMediaImpl(media_url, placeholder_texture_id,
- media_width, media_height, media_auto_scale,
+ sMediaImpl = LLViewerMedia::newMediaImpl(
+ placeholder_texture_id,
+ media_width,
+ media_height,
+ media_auto_scale,
media_loop);
+ sMediaImpl->navigateTo(media_url);
}
LLFirstUse::useMedia();