summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprimmediacontrols.cpp
AgeCommit message (Collapse)Author
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
2020-08-21SL-13828 Fixed the Media URL editing on the media primAndrey Lihatskiy
2020-08-13SL-13149 FIXED URLs copied from MoaP have 6 space characters at the beginningMnikolenko Productengine
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-05-27SL-13148 Implemented wheel support for inworld mediaAndrey Kleshchev
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-03-20SL-2222 FIXED Media Control still offers zoom out when already zoomed outMnikolenko Productengine
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2019-11-27Upstream merge from viewer-nekoAndreyL ProductEngine
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-12Downstream merge from 494-maint-wassailAndreyL ProductEngine
2019-10-16Brought back the changes from @andreyk for improved mouse scroll wheel ↵AndreyL ProductEngine
performance (previously 8e228364f324)
2019-09-14Backed out changeset: 8e228364f324AndreyL ProductEngine
2019-06-21DRTVWR-493 LLViewerMedia to singletonandreykproductengine
2019-06-10Changes from @andreyk for improved mouse scroll wheel performance and pull ↵callum_linden
in new Dullahan with CEF 74.1.19_gb62bacf_chromium-74.0.3729.157
2018-05-01Le MergeGraham Linden graham@lindenlab.com
2016-12-28MAINT-2450 PRIM_MEDIA_PERMS_CONTROL shouldn't disable mouse wheel scrollingandreykproductengine
2016-07-21First pass at enabling time based media (videos) scrubbing controlsCallum Linden
2016-03-16merge changes for DRTVWR-417Oz Linden
2016-01-05MAINT-1392 HUD objects Behave Badly in conjunction with the Mouse Scroll WheelMnikolenko ProductEngine
2015-11-10remove execute permission from many files that should not have itOz Linden
2014-12-10Rename llround(..) to ll_round(..) because of a collision with MS llround ↵callum_linden
(long long round) in VS2013
2013-11-06merge with releaseRichard Linden
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-23ACME-734 : MoaP : Move the secure lock icon to the left on Media on Prim ↵Merov Linden
address bar
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-02-07EXP-1181 WIP as a designer I would like to specify default floater positions ↵Richard Linden
using realtive coordinates changed over to new convert() method added LLCoordFloater
2011-12-12EXP-1711 FIX LLWindowShade doesn't stack multiple notificationsRichard Linden
2011-01-07Automated merge up from viewer-developmentLoren Shih
2010-12-29Automated merge up from viewer-developmentLoren Shih
2010-12-28STORM-714 FIXED Webprim's control bar doesn't dissapear after switching to ↵Paul Guslisty
mouselook mode - After switching to the mouse look mode hide control bar immediately, not fading it with timer - Added signal for switching mouse look mode out just for convenience. It's not used in this fix.
2010-12-20Merge from viewer-development.Monroe Linden
2010-12-13Automated merge up from viewer-developmentLoren Shih
2010-12-10WIP XUI HTTP Auth dialogRichard Linden
refactored LLWindowShade into seperate file improved layout of dialog improved dialog resizing logic Tab and Enter keys now work as expected in windowshade form added "modal" capability to window shade added HTTP Auth notifications to MOAP
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-08made progressbar derive from lluictrl and take percentage as llsd valueRichard Linden
2010-10-08EXP-137 FIXED Nametag text and borders do not align in Skylight ViewerRichard Linden
fix for prim media and hud text incorrect positioning when destination guide is open
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-25mergeDave Parks
2010-08-20changed buildPanel/buildFloater to member functions buildFromFileRichard Nelson
streamlined LLUICtrlFactory's interface
2010-08-19Integrate SIMD API from oreh/server-trunk-orehDave Parks
2010-08-16cleaned up LLUICtrlFactory...Richard Nelson
removed redundant functionality moved buildPanel to LLPanel
2010-08-09Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicMonroe Linden
2010-08-06Fixes for EXT-8563 "VWR-20156: Prim Media on HUDs has no Audio or Interactivity"Monroe Linden
Backed out changeset 1b65d0d42c67 (the fix for EXT-5205), and replaced it with a check in LLPanelPrimMediaControls::nextZoomLevel(). Made LLViewerMediaImpl::calculateInterest() not attempt to calculate distances to HUD attachments, since their global positions are invalid.
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-04deprecated ADD_SORTED due to n^2 behavior, set the sort order on the scroll ↵Richard Nelson
list instead
2010-05-29Octree per LLVolumeFace WIPDave Parks
2010-05-26Fully aligned llvolumeDave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 19:59:11 +0000