diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-04-30 22:52:40 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-04-30 22:52:40 -0600 |
| commit | 1b827077717483d59d1d16ec4203ae9fb8199c8f (patch) | |
| tree | b35e86a9d75bdaf8daed22d0eb18a36682be7ae3 /indra/newview/llviewermedia.cpp | |
| parent | 0516ef218b4745ac3f109554b147a9802341237c (diff) | |
| parent | 66a445298e2991cbfd29affa445c76b56b8631d5 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index c6f8ce2e15..1f6687bd83 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1586,6 +1586,7 @@ void LLViewerMediaImpl::destroyMediaSource() if(mMediaSource) { + mMediaSource->setDeleteOK(true) ; delete mMediaSource; mMediaSource = NULL; } @@ -1737,7 +1738,7 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type) } mMediaSource = media_source; - + mMediaSource->setDeleteOK(false) ; updateVolume(); return true; |