From 98f33106618af6e321e8ca3b89915f76f8ce5373 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 11 Apr 2018 08:48:35 -0400 Subject: DRTVWR-453: Update to viewer-manager build 514367 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index c4f0598574..de66e7d683 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3260,9 +3260,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - f87126aaff2bfd98a725900c227fdd95 + 9308ad92ea0104bf75034fc607eedc74 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14331/90920/viewer_manager-1.0.512994-darwin64-512994.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/16517/108862/viewer_manager-1.0.514367-darwin64-514367.tar.bz2 name darwin64 @@ -3284,9 +3284,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 0cda02896adfafbfab16927e28cc41aa + 0879d503ad2fe4d46913e80c053d1d1a url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14328/90898/viewer_manager-1.0.512994-windows-512994.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/16518/108869/viewer_manager-1.0.514367-windows-514367.tar.bz2 name windows @@ -3297,7 +3297,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 1.0.512994 + 1.0.514367 vlc-bin -- cgit v1.2.3 From 08fd73410e9a7ffb64acb15422fc6836230aa588 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 22 Jun 2018 20:49:40 +0300 Subject: MAINT-8686 Don't log empty list --- indra/llcommon/llcoros.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp index 3165ce0743..67e9fad1ab 100644 --- a/indra/llcommon/llcoros.cpp +++ b/indra/llcommon/llcoros.cpp @@ -284,17 +284,20 @@ void LLCoros::setStackSize(S32 stacksize) void LLCoros::printActiveCoroutines() { LL_INFOS("LLCoros") << "Number of active coroutines: " << (S32)mCoros.size() << LL_ENDL; - LL_INFOS("LLCoros") << "-------------- List of active coroutines ------------"; - CoroMap::iterator iter; - CoroMap::iterator end = mCoros.end(); - F64 time = LLTimer::getTotalSeconds(); - for (iter = mCoros.begin(); iter != end; iter++) + if (mCoros.size() > 0) { - F64 life_time = time - iter->second->mCreationTime; - LL_CONT << LL_NEWLINE << "Name: " << iter->first << " life: " << life_time; + LL_INFOS("LLCoros") << "-------------- List of active coroutines ------------"; + CoroMap::iterator iter; + CoroMap::iterator end = mCoros.end(); + F64 time = LLTimer::getTotalSeconds(); + for (iter = mCoros.begin(); iter != end; iter++) + { + F64 life_time = time - iter->second->mCreationTime; + LL_CONT << LL_NEWLINE << "Name: " << iter->first << " life: " << life_time; + } + LL_CONT << LL_ENDL; + LL_INFOS("LLCoros") << "-----------------------------------------------------" << LL_ENDL; } - LL_CONT << LL_ENDL; - LL_INFOS("LLCoros") << "-----------------------------------------------------" << LL_ENDL; } #if LL_WINDOWS -- cgit v1.2.3 From 8602c5827caf40b654e9a6fed0d345fb0eee610b Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 25 Jun 2018 18:51:34 +0300 Subject: MAINT-8457 FIXED "Mute" switching cancels the volume settings of Nearby Media --- indra/newview/llpanelnearbymedia.cpp | 6 +++--- indra/newview/llviewermedia.cpp | 15 +++++++++++++++ indra/newview/llviewermedia.h | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index d8ef5b39ad..f3a2ed9408 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -1168,12 +1168,12 @@ void LLPanelNearByMedia::onClickSelectedMediaMute() F32 volume = impl->getVolume(); if(volume > 0.0) { - impl->setVolume(0.0); + impl->setMute(true); } else if (mVolumeSlider->getValueF32() == 0.0) { - impl->setVolume(1.0); - mVolumeSlider->setValue(1.0); + impl->setMute(false); + mVolumeSlider->setValue(impl->getVolume()); } else { diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 4334cbfda3..22a21c9ca3 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1555,6 +1555,7 @@ LLViewerMediaImpl::LLViewerMediaImpl( const LLUUID& texture_id, mNavigateServerRequest(false), mMediaSourceFailed(false), mRequestedVolume(1.0f), + mPreviousVolume(1.0f), mIsMuted(false), mNeedsMuteCheck(false), mPreviousMediaState(MEDIA_NONE), @@ -2081,6 +2082,20 @@ void LLViewerMediaImpl::setVolume(F32 volume) updateVolume(); } +////////////////////////////////////////////////////////////////////////////////////////// +void LLViewerMediaImpl::setMute(bool mute) +{ + if (mute) + { + mPreviousVolume = mRequestedVolume; + setVolume(0.0); + } + else + { + setVolume(mPreviousVolume); + } +} + ////////////////////////////////////////////////////////////////////////////////////////// void LLViewerMediaImpl::updateVolume() { diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index c52960dfcf..e2e758befb 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -216,6 +216,7 @@ public: void skipBack(F32 step_scale); void skipForward(F32 step_scale); void setVolume(F32 volume); + void setMute(bool mute); void updateVolume(); F32 getVolume(); void focus(bool focus); @@ -448,6 +449,7 @@ private: bool mNavigateServerRequest; bool mMediaSourceFailed; F32 mRequestedVolume; + F32 mPreviousVolume; bool mIsMuted; bool mNeedsMuteCheck; int mPreviousMediaState; -- cgit v1.2.3 From 020757ff0170aa894c56cd719d46413c9e99fde6 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 26 Jun 2018 09:42:26 -0400 Subject: DRTVWR-453: Update to viewer-manager build 517052 --- autobuild.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index fb45343440..04b08dc5bf 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1692,7 +1692,7 @@ darwin archive - + hash 3855bd40f950e3c22739ae8f3ee2afc9 url @@ -1705,10 +1705,10 @@ archive - hash + hash d1521becaf21bf7233173722af63f57d url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15257/98440/kdu-7.10.4.513518-darwin64-513518.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15257/98440/kdu-7.10.4.513518-darwin64-513518.tar.bz2 name darwin64 @@ -1717,10 +1717,10 @@ archive - hash + hash 43d7a6a69a54534a736f132e9c81795b url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15255/98451/kdu-7.10.4.513518-linux-513518.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15255/98451/kdu-7.10.4.513518-linux-513518.tar.bz2 name linux @@ -1752,11 +1752,11 @@ windows64 archive - + hash da3b1ea90797b189d80ab5d50fdf05d4 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15260/98469/kdu-7.10.4.513518-windows64-513518.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15260/98469/kdu-7.10.4.513518-windows64-513518.tar.bz2 name windows64 @@ -3260,9 +3260,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 9308ad92ea0104bf75034fc607eedc74 + f45c0a5e7b4601b355e163bf62f5718e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/16517/108862/viewer_manager-1.0.514367-darwin64-514367.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/20587/147509/viewer_manager-1.0.517052-darwin64-517052.tar.bz2 name darwin64 @@ -3284,9 +3284,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 0879d503ad2fe4d46913e80c053d1d1a + d2443caf062697430071d458a965f611 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/16518/108869/viewer_manager-1.0.514367-windows-514367.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/20588/147516/viewer_manager-1.0.517052-windows-517052.tar.bz2 name windows @@ -3297,7 +3297,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 1.0.514367 + 1.0.517052 vlc-bin -- cgit v1.2.3