Commit Graph

49 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Richard Nelson 3afda3d1c0 EXT-6921 - Media Volume Changes changes system volume on WinXP
reviewed by Callum
2010-04-19 17:01:47 -07:00
Leyla Farazha ba057d34cd Fixed prim controls mute bug
Reviewed by Richard CC#204
2010-04-16 14:48:06 -07:00
Leyla Farazha 652d18e6c4 Adding volume controls in NMP
reivewed by RIchard cc#194
2010-04-16 14:18:21 -07:00
Leyla Farazha 10b5c10310 EXT-6856 Display per media volume control
reviewed by Richard cc#189
2010-04-14 18:11:51 -07:00
Loren Shih 7a8c6a235e EXT-6632 : INFRASTRUCTURE: LLAgentCamera / LLAgent header file / #include cleanup
Took out unnecessary #includes from llagentcamera.*
2010-03-30 15:05:48 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
Rick Pasetto c6a8d9a7e7 Tweak sizes a tiny bit to make media controls look a little better 2010-02-16 10:40:39 -08:00
Leyla Farazha 617a7a0ebd EXT-4102 [BSI] auto zoom on media prims push camera away when zoomed in and clicking
reviewed by Rick
2010-02-05 16:46:49 -08:00
Rick Pasetto dfa5ade487 Remove crufty and unused volume up/down controls 2010-01-15 11:10:49 -08:00
Rick Pasetto 4a870a0887 EXT-3649 EXT-3662 : Move media controls to above media face
Review #69
This changes where and how the media controls are laid out, and ensures that all of the media region (the face) is clickable. Also moved the volume slider to below the controls (this took WAY too long to do ​:( ​), and adjusted the window region in which the media controls are allowed to be displayed.
2010-01-05 14:33:27 -08:00
Rick Pasetto e1b712a3a6 DEV-42827: auto-hide media controls volume slider if neither it nor mute button has the mouse over it
Review #66
fade-out was going to be harder, but just making it visible/invisible turned out to be pretty easy
2009-12-16 15:03:21 -08:00
Rick Pasetto b877ed17e8 DEV-42327: Compute controls position & size for HUD objects
Review #62
Added facility to get the HUD projection and modelview matrices by refactoring the calls in llviewerdisplay a bit.
2009-12-14 15:41:09 -08:00
Rick Pasetto 75a5f3c52e Follow-up to previous change: slider control should only be set when focus changes 2009-12-09 11:30:28 -08:00
Rick Pasetto 8e31171ee3 DEV-43866: Fix mute button when you slide volume slider
Trivial fix, plus some minor refactoring
2009-12-08 16:49:47 -08:00
Rick Pasetto 8752f020fc Don't show controls if build tools are up 2009-12-03 11:37:51 -08:00
Rick Pasetto 42fbb0abcd remove fudge factor for controls background rendering 2009-12-03 11:28:26 -08:00
Rick Pasetto 3c69340570 DEV-42827 Implement volume slider on media controls
Introducing a volume slider that pops up when you hover
over the "mute" button.  Fades out with the rest of the
controls.  Had to also render (by hand) the background
image.  Cleaned up the XUI file.
2009-12-02 21:30:41 -08:00
Rick Pasetto a7fde5f530 DEV-43402: Don't change the zoom level on the media controls if you click away
Review #46

This also adds a feature where llpanelprimmediacontrols remembers
the object/face that you've zoomed in on, and only switches the
zoom/unzoom icon to "unzoom" if the object/face you are hovering over
is actually the object/face you are zoomed in on
2009-11-25 15:50:31 -08:00
Rick Pasetto 3efbd20980 Implement fade-out for llprogressbar, fix problem where setTopCtrl was being called
Review #47
2009-11-25 14:39:05 -08:00
Rick Pasetto 751a904982 DEV-43046: Move media controls to the bottom of media
- Tweaked the algorithm to shift controls down when zoomed in.
- Adjusted some numbers in the XUI file
- Moved some hard-coded constants into the XUI file so they can be data-driven
2009-11-25 13:22:18 -08:00
Rick Pasetto 45e9a060b4 DEV-41422 Show Home button and make Stop button remain enabled in time-based media controls 2009-11-25 10:40:26 -08:00
Rick Pasetto ce7102d300 FIX DEV-43033 - the prim media controls were "stealing focus" and so would clobber any drop-downs
Reviewed by James (thanks, James!)
2009-11-24 16:51:04 -08:00
Monroe Linden 1b07c1d7fb Fix for DEV-43040 (Change media focus rules to be the same as alt-zoom).
Added an optional reset_camera parameter to LLPanelPrimMediaControls ::resetZoomLevel(). Default is true, but if false it prevents the reset from moving the camera, and just resets the internal state for zoom tracking.

Fixed zoom-related bugs in LLPanelPrimMediaControls::close() and LLPanelPrimMediaControls::onClickZoom().

Changed the zooming behavior in LLViewerMediaFocus to match the desired behavior.
2009-11-20 17:49:52 -08:00
Rick Pasetto a8b603f33e Push the policy that "back", "forward" and "stop" do different things out of LLViewerMedia.
Now, LLViewerMedia has explicit skipBack() and skipForward()
functions, and the buttons in LLPanelPrimMediaControls now map
onto those functions neatly.
2009-11-19 18:34:37 -08:00
Rick Pasetto 98d54377f9 Make time-based media "forward" and "back" different from navigate forward and navigate back 2009-11-19 16:47:29 -08:00
Rick Pasetto a4addf39e5 Small mods based on code review feedback from James 2009-11-13 15:09:59 -08:00
Rick Pasetto ca630bf6bb Add background to media controls
This actually required some help from James and Richard.  Thanks, guys!

This adds custom-drawing of a background image underneath the
icons that make up the media controls in the layout stack.
In order to have this work, we had to publicize API in lllayoutstack
to force relayout to calculate the size.

I also did another cleanup pass ("Boy Scout Rule") that
squirreled away all pertinent controls into membed variables,
instead of doing a getChild() every time updateShape() is called.

Readjusted a bunch of components as well.
2009-11-13 11:52:12 -08:00
Rick Pasetto 6a3e8353a7 Fix merge error (and hence build breakage :( ) 2009-11-11 16:32:54 -08:00
Rick Pasetto 4a376104f1 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 16:14:19 -08:00
Rick Pasetto bea3b937d9 Fix a potential crash if scroll button is not there 2009-11-11 16:12:25 -08:00
Monroe Linden eda34b82ee Remove references to media_panel_scroll in LLPanelPrimMediaControls::updateShape(), as it was removed from the XUI file. 2009-11-11 15:50:43 -08:00
James Cook bc4b49735c merge 2009-11-10 14:36:25 -08:00
James Cook 0f6242d9fd Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
richard 3b2d9f63e3 merge 2009-11-09 16:14:52 -08:00
richard 4eb72a12a2 data driven layout of top-level UI elements
EXT-1219 Side tray slide-out animation
cleaned up some layout of bottom tray contents

reviewed by James
2009-11-09 15:29:47 -08:00
Rick Pasetto d4f790f728 FIX: zoom/unzoom should appear to be one icon
this was a fairly trivial UI change....
2009-11-06 13:07:50 -08:00
Monroe Linden 0bd2567bf5 Fix for DEV-42076 (media controls should not fade out while mouse is hovered over them).
Updated LLPanelPrimMediaControls::isMouseOver() to do the right thing with the new structure of the panel.
2009-11-04 15:59:04 -08:00
Rick Pasetto 44eea89d00 Make the "default hover controls" be the "authored" controls
(and I made a debug setting that can override this)
2009-11-02 15:10:08 -08:00
Monroe Linden 8604c978ca Fixes for DEV-41612, DEV-41693, DEV-41963.
Made LLViewerMediaFocus::update clear inworld media focus if LLViewerMediaFocus has lost keyboard focus to anything besides the media controls, or LLToolMgr::inBuildMode() returns true.

Also, never fade the media controls if they have keyboard focus (this fixes the media controls fading out while the user is trying to type an URL).
2009-10-29 18:38:02 -07:00
Monroe Linden 96e46f9127 Fix for DEV-41755 2009-10-29 18:01:51 -07:00
Rick Pasetto f93febc914 Merge remote repo 2009-10-29 18:16:03 -07:00
Rick Pasetto 7f8b630253 Fix unposted bug: make sure to use the right slider control 2009-10-29 17:49:38 -07:00
Monroe Linden 5c4ec60c96 Fix a copy-paste error in LLPanelPrimMediaControls::postBuild(). 2009-10-29 17:04:42 -07:00
Monroe Linden c953385351 Missed the "hold the button down" case when converting horizontal scroller to use horizontal mousewheel events. 2009-10-29 16:59:34 -07:00
Monroe Linden 8357fe51aa Added LLViewerMediaImpl::scrollWheel() to route scroll wheel events through the media impl.
The horizontal scroll arrows in the media controls now send horizontal scrollwheel events instead of arrow keys.
2009-10-29 16:10:37 -07:00
Monroe Linden 4d1a2ef2d1 Fix for DEV-41978 (media controls URL is incorrect after whitelist bounces webpage back).
Added LLViewerMediaImpl::getCurrentMediaURL(), which reflects the most recent url either set with navigateTo or received from the plugin via locationChanged/navigateComplete.  LLViewerMediaImpl now uses this when reload() is called.

LLPanelPrimMediaControls now uses getCurrentMediaURL() to get the url it displays in the URL input bar and opens with the pop-out control.
2009-10-29 16:09:27 -07:00
Rick Pasetto 0595c97f69 Fix unposted bug where current URL is not showing in the media controls 2009-10-29 14:09:13 -07:00
Rick Pasetto 64c2cb6ba1 Completion of rename of llpanelmediahud to llpanelprimmediacontrols 2009-10-28 19:20:30 -07:00
Rick Pasetto 67879996ca rename llpanelmediahud to llpanelprimmediacontrols 2009-10-28 18:53:43 -07:00