summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermediafocus.cpp
AgeCommit message (Collapse)Author
2010-06-07Merge with render-pipelineDave Parks
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-05-13Fix for DEV-50040 (MoAP Auto Zoom Feature Buggy on Welcome Island Kiosks)Monroe Linden
Fixed a logic error in LLViewerMediaFocus::getBBoxAspectRatio() that caused it to sometimes return bogus results. Added a number of lldebugs messages to LLViewerMediaFocus::getBBoxAspectRatio() and LLViewerMediaFocus::setCameraZoom() that may be useful when working on the autozoom code in the future.
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-02-24EXT-5362 clicking an AutoZoom web prim twice will focus camera on your avatarLeyla Farazha
reviewed by Richard - CC#142
2010-02-16EXT-5270: Implement "dynamic" controls based on the selected item in Nearby ↵Rick Pasetto
Media Review #112 This change adds controls that change state based on the selection in the nearby media panel. There are basically 3 sets: - Time-based - Web-based ("Normal") - Disabled Again, these change based on what you've got selected in the panel
2010-02-05EXT-4102 [BSI] auto zoom on media prims push camera away when zoomed in ↵Leyla Farazha
and clicking reviewed by Rick
2009-12-16DEV-41904: Have F1 key bring up context-sensitive help for media controlsRick Pasetto
Review #65 Adds help topic to media controls panel, and add handling F1 key to media focus
2009-12-14Allow selection of media faces even if there is no impl. We recordRick Pasetto
the target object and use that fact to raise its interest level. This is mostly a pass-off for monroe to take and run with
2009-11-25DEV-43402: Don't change the zoom level on the media controls if you click awayRick Pasetto
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-20Fix for DEV-43040 (Change media focus rules to be the same as alt-zoom).Monroe Linden
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-06Partial fix for DEV-42153.Monroe Linden
This code seems to work on some objects and not on others. I suspect I'm not doing something quite right in LLVOVolume::getApproximateFaceNormal().
2009-11-05Restore the media focus ring. This fixes DEV-42166.Monroe Linden
Media focus is still tracked separately from LLSelectMgr (which was a change made during a refactor a while ago), but LLViewerMediaFocus now keeps LLSelectMgr updated with the current media focus when it changes. Added a special case for media focus to LLSelectMgr::deselectAllIfTooFar(), since it was making the focus ring not show up when media focus was on distant media.
2009-11-02Changed the operation of the "mute all" button in the nearby media floater ↵Monroe Linden
to be closer to spec-compliant, per a design discussion this afternoon.
2009-10-30Another experiment: made the selection in the nearby media floater track the ↵Monroe Linden
media impl the media controls are currently referencing (either focus or hover).
2009-10-30On a double-click in the nearby media list, try to focus/zoom in on the prim ↵Monroe Linden
holding the media.
2009-10-29In LLViewerMediaFocus::setFocusFace(), when clearing focus, only clear ↵Monroe Linden
keyboard focus if the object had it in the first place.
2009-10-29Fixes for DEV-41612, DEV-41693, DEV-41963.Monroe Linden
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-29Made LLViewerMediaFocus::handleScrollWheel() grab the current keyboard ↵Monroe Linden
modifiers.
2009-10-28Completion of rename of llpanelmediahud to llpanelprimmediacontrolsRick Pasetto
2009-10-28rename llpanelmediahud to llpanelprimmediacontrolsRick Pasetto
2009-10-28DEV-40210 : restructure media controls UIRick Pasetto
This change completely restructures the media controls XUI so that it is now more flexible so as to implement mini vs. standard controls. It also now allows for changes based on artwork and design still as unyet delivered from 80/20, as well as any feedback from Brian's user testing. This is also step 1 of renaming the media "hud" to media "controls"
2009-10-27Fixes for several keyboard focus issues around prim media.Monroe Linden
2009-10-23Changes to match new version of llqtwebkit -- passing modifier keys through ↵Monroe Linden
to most user events and using new scroll wheel event.
2009-10-15Major refactor of LLViewerMediaFocus and LLPanelMediaHUD.Monroe Linden
LLViewerMediaFocus now tracks two separate objects: the currently focused media object, and the media object that's currently being hovered over. It no longer stores smart pointers to either the LLViewerObject or the LLViewerMediaImpl -- it now looks up both by UUID every time they're needed, and fails gracefully if either goes away. This will prevent it from keeping objects from being deleted. The poorly-understood "mouseOverFlag" has been expunged. LLViewerMediaFocus no longer uses LLSelectMgr at all. The object to focus on is explicitly passed between LLViewerMediaFocus and LLPanelMediaHUD instead of going indirectly through the selection manager. LLViewerMediaFocus also no longer interacts with the pick from LLToolPie -- the data it needs from the pick (the object and normal vector) is passed explicitly. LLViewerMediaFocus::setCameraZoom and LLViewerMediaFocus::getBBoxAspectRatio now have no dependencies on the LLViewerMediaFocus object -- all the data they need is passed in when they're called by the LLPanelMediaHUD. I made them static member functions, but they could be moved to LLPanelMediaHUD or even made into file-scoped static functions. The only reason I didn't do either of those is that it seems like they belong with the LLViewerMediaFocus code as opposed to the HUD.
2009-10-15Clarify comments a littleRick Pasetto
2009-10-15FIX DEV-39513: Tweak target camera position to avoid a flip when target ↵Rick Pasetto
normal is vertical Review #21 This attempts to tweak the target camera position slightly towards where the camera started from, so as to avoid the flip noted in this JIRA.
2009-10-13DEV-388867, DEV-39246Rick Pasetto
Escape key cancels zoom, zoom in closer I also refactored the code a little to be able to experiment with more zoom levels. Review #13
2009-10-08DEV-39056 - Fix scroll wheel on primsRick Pasetto
the scrollEvent() API's x and y are not the same as handleScrollWheel's x and y. The latter is the position of the mouse at the time of the event. The former is the 'scroll amount' in x and y, respectively. All we have for 'scroll amount' here is 'clicks', and no mask.
2009-10-01svn merge -r 134922:134973 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-09-23* EXT-1037 - Left-clicking anywhere in in-world area resets camera positionSteven Bennetts
NOTE: Temporary fix that may break MOAP behavior. Needs to be reviewd and potentially designed.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.