summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-10-20 19:13:01 -0700
committerMonroe Linden <monroe@lindenlab.com>2009-10-20 19:13:01 -0700
commiteaf27e7fac1ff462878da1983250e13aef931707 (patch)
tree9f67de7c141f2ebde76ad885cb5ed63bf263e06d /indra/newview
parent85c4d40614b501d401159b9bb064a4f4c726265e (diff)
Fix for DEV-41572 (login screen image does not display).
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewertexture.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index a0ab4cb1e6..95459a7116 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -2434,10 +2434,11 @@ void LLViewerMediaTexture::removeFace(LLFace* facep)
void LLViewerMediaTexture::stopPlaying()
{
- if(mMediaImplp)
- {
- mMediaImplp->stop() ;
- }
+ // Don't stop the media impl playing here -- this breaks non-inworld media (login screen, search, and media browser).
+// if(mMediaImplp)
+// {
+// mMediaImplp->stop() ;
+// }
mIsPlaying = FALSE ;
}