diff options
author | Armin Weatherwax | 2010-09-07 10:26:01 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:38:26 +0200 |
commit | 9d37fb4eeb15f7ac35ebaa3fd7c5cc11e5b1a1dc (patch) | |
tree | fd86b97c3603d8c8f678b4c1be4de9b45f2555e6 /linden/indra/newview/llviewerparcelmedia.cpp | |
parent | lost in merge: 1 debug setting, some member variables from llpanellandmedia (diff) | |
download | meta-impy-9d37fb4eeb15f7ac35ebaa3fd7c5cc11e5b1a1dc.zip meta-impy-9d37fb4eeb15f7ac35ebaa3fd7c5cc11e5b1a1dc.tar.gz meta-impy-9d37fb4eeb15f7ac35ebaa3fd7c5cc11e5b1a1dc.tar.bz2 meta-impy-9d37fb4eeb15f7ac35ebaa3fd7c5cc11e5b1a1dc.tar.xz |
First LL update of plugins, mainly documentation
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerparcelmedia.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp index c7f0c4b..d4ebbd9 100644 --- a/linden/indra/newview/llviewerparcelmedia.cpp +++ b/linden/indra/newview/llviewerparcelmedia.cpp | |||
@@ -193,6 +193,9 @@ void LLViewerParcelMedia::play(LLParcel* parcel) | |||
193 | S32 media_width = parcel->getMediaWidth(); | 193 | S32 media_width = parcel->getMediaWidth(); |
194 | S32 media_height = parcel->getMediaHeight(); | 194 | S32 media_height = parcel->getMediaHeight(); |
195 | 195 | ||
196 | // Debug print | ||
197 | // LL_DEBUGS("Media") << "Play media type : " << mime_type << ", url : " << media_url << LL_ENDL; | ||
198 | |||
196 | if(sMediaImpl) | 199 | if(sMediaImpl) |
197 | { | 200 | { |
198 | // If the url and mime type are the same, call play again | 201 | // If the url and mime type are the same, call play again |
@@ -221,7 +224,7 @@ void LLViewerParcelMedia::play(LLParcel* parcel) | |||
221 | 224 | ||
222 | sMediaImpl = LLViewerMedia::newMediaImpl(media_url, placeholder_texture_id, | 225 | sMediaImpl = LLViewerMedia::newMediaImpl(media_url, placeholder_texture_id, |
223 | media_width, media_height, media_auto_scale, | 226 | media_width, media_height, media_auto_scale, |
224 | media_loop); | 227 | media_loop, mime_type); |
225 | } | 228 | } |
226 | } | 229 | } |
227 | else | 230 | else |
@@ -229,7 +232,7 @@ void LLViewerParcelMedia::play(LLParcel* parcel) | |||
229 | // There is no media impl, make a new one | 232 | // There is no media impl, make a new one |
230 | sMediaImpl = LLViewerMedia::newMediaImpl(media_url, placeholder_texture_id, | 233 | sMediaImpl = LLViewerMedia::newMediaImpl(media_url, placeholder_texture_id, |
231 | media_width, media_height, media_auto_scale, | 234 | media_width, media_height, media_auto_scale, |
232 | media_loop); | 235 | media_loop, mime_type); |
233 | } | 236 | } |
234 | 237 | ||
235 | 238 | ||