aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:35 -0500
committerJacek Antonelli2008-08-15 23:45:35 -0500
commit7a29b2d1cd471767b58ea30f53900cd2c5a9637c (patch)
treea2f7b5eb90ec41f903f2558e57d47f5ebd913a8f /linden/indra/newview/llviewermedia.cpp
parentSecond Life viewer sources 1.19.1.0 (diff)
downloadmeta-impy-7a29b2d1cd471767b58ea30f53900cd2c5a9637c.zip
meta-impy-7a29b2d1cd471767b58ea30f53900cd2c5a9637c.tar.gz
meta-impy-7a29b2d1cd471767b58ea30f53900cd2c5a9637c.tar.bz2
meta-impy-7a29b2d1cd471767b58ea30f53900cd2c5a9637c.tar.xz
Second Life viewer sources 1.19.1.1
Diffstat (limited to 'linden/indra/newview/llviewermedia.cpp')
-rw-r--r--linden/indra/newview/llviewermedia.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 0cc4e2d..0429a3c 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -147,6 +147,9 @@ void LLViewerMediaImpl::play(const std::string& media_url,
147 return; 147 return;
148 } 148 }
149 149
150 // Store the URL and Mime Type
151 mMediaURL = media_url;
152
150 if ((media_width != 0) && (media_height != 0)) 153 if ((media_width != 0) && (media_height != 0))
151 { 154 {
152 mMediaSource->setRequestedMediaSize(media_width, media_height); 155 mMediaSource->setRequestedMediaSize(media_width, media_height);
@@ -157,10 +160,6 @@ void LLViewerMediaImpl::play(const std::string& media_url,
157 mMediaSource->addObserver( this ); 160 mMediaSource->addObserver( this );
158 mMediaSource->navigateTo( media_url ); 161 mMediaSource->navigateTo( media_url );
159 mMediaSource->addCommand(LLMediaBase::COMMAND_START); 162 mMediaSource->addCommand(LLMediaBase::COMMAND_START);
160
161 // Store the URL and Mime Type
162 mMediaURL = media_url;
163
164} 163}
165 164
166void LLViewerMediaImpl::stop() 165void LLViewerMediaImpl::stop()