From 5fbf81d17eae532da6d9537401bd677eb04c90ff Mon Sep 17 00:00:00 2001 From: angela Date: Thu, 25 Feb 2010 01:00:50 +0800 Subject: EXT-5410 Streaming audio does ignores preference setting. --- indra/newview/llviewermedia.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewermedia.cpp') diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 86336e353c..344c4c469b 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -851,7 +851,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg) } } // update the audio stream here as well - if(!inworld_media_enabled || !inworld_audio_enabled) + if( !inworld_audio_enabled) { if(LLViewerMedia::isParcelAudioPlaying() && gAudiop && LLViewerMedia::hasParcelAudio()) { -- cgit v1.3 From 3614dc007328111462297e9244f370fb5f4a0910 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Wed, 3 Mar 2010 17:13:14 -0800 Subject: Potential fix for EXT-5850 (Crash in LLPluginClassMedia::idle) We don't actually have a repro for this bug, just a number of crash reports. This potential fix makes an iterator loop safer in the face of the iterator changing during the loop. See the jira for further details. Reviewed by Richard at http://codereview.lindenlab.com/331008 --- indra/newview/llviewermedia.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewermedia.cpp') diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 344c4c469b..59b4ae6aa6 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -700,9 +700,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg) impl_list::iterator iter = sViewerMediaImplList.begin(); impl_list::iterator end = sViewerMediaImplList.end(); - for(; iter != end; iter++) + for(; iter != end;) { - LLViewerMediaImpl* pimpl = *iter; + LLViewerMediaImpl* pimpl = *iter++; pimpl->update(); pimpl->calculateInterest(); } -- cgit v1.3 From 2ce7807c9e15f3941d9aa2db57cbb26cda42ba09 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 4 Mar 2010 14:31:10 -0800 Subject: Fix for EXT-5960 (Store media cookies per user rather than per viewer) Reviewed by RN and MW --- indra/newview/llviewermedia.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indra/newview/llviewermedia.cpp') diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 344c4c469b..4c09b7cf3e 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1229,6 +1229,19 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ std::string user_data_path = gDirUtilp->getOSUserAppDir(); user_data_path += gDirUtilp->getDirDelimiter(); + // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.) + // If the linden username returned is blank, that can only mean we are + // at the login page displaying login Web page or Web browser test via Develop menu. + // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this + // is what we always used before this change) + std::string linden_user_dir = gDirUtilp->getLindenUserDir(); + if ( ! linden_user_dir.empty() ) + { + // gDirUtilp->getLindenUserDir() is whole path, not just Linden name + user_data_path = linden_user_dir; + user_data_path += gDirUtilp->getDirDelimiter(); + }; + // See if the plugin executable exists llstat s; if(LLFile::stat(launcher_name, &s)) -- cgit v1.3