diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-21 18:49:19 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-21 18:49:19 -0700 |
| commit | 642d368eccd662494a4958a50ba2bd3301b5207e (patch) | |
| tree | 0aaa9d2981260051009e765a6171ad328f031183 /indra/newview/llviewertexture.cpp | |
| parent | c7786aa5b614d1c88359bacbe9bd447f5acdd84c (diff) | |
| parent | e25395e10f5abbed1ed7bc3e4a7fc892070ddc50 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 9 |
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 ; } |