summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
AgeCommit message (Collapse)Author
2009-11-02Make the "default hover controls" be the "authored" controlsRick Pasetto
(and I made a debug setting that can override this)
2009-11-02Hook up LLViewerMediaImpl::getName() to call through to ↵Monroe Linden
LLPluginClassMedia::getMediaName() as it should.
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-30Add implementation for adding and removing items to and from the nearby ↵Rick Pasetto
media list scroll control
2009-10-30Partial implementation of LLFloaterNearbyMedia::refreshList(), with many ↵Monroe Linden
TODO sections and a bit of ifdef-ed out pseudocode. Initial pass at LLViewerMediaImpl::getProximity(). Currently it just returns the position in the priority list, but that will change.
2009-10-30Fixed a couple problems with getPriorityList().Monroe Linden
2009-10-30Fix a couple other build issues with my previous commit.Monroe Linden
2009-10-30Fix for typo in my last commit.Monroe Linden
2009-10-30Hooks for the "nearby media" UI.Monroe Linden
Added LLViewerMediaImpl::set/getDisabled(), which will prevent a media instance from loading. Added LLViewerMedia::set/getInWorldMediaDisabled(), which will disable all inworld media fom loading. Added LLViewerMedia::getPriorityList() and made the priority comparitor public.
2009-10-29Added LLViewerMediaImpl::scrollWheel() to route scroll wheel events through ↵Monroe Linden
the media impl. The horizontal scroll arrows in the media controls now send horizontal scrollwheel events instead of arrow keys.
2009-10-29Fix for DEV-41978 (media controls URL is incorrect after whitelist bounces ↵Monroe Linden
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-28Fixes for DEV-41791 and DEV-41920.Monroe Linden
Reworked some of the autoplay logic in LLViewerMediaImpl to try and make it more consistent when media is unloaded and reloaded by the performance manager. LLViewerMediaImpl will now keep track of the media state and current time of media that it unloads for performance reasons, and attempt to restore playing or paused media to the same playhead time and state (playing or paused) when it reloads. Added "done" status that time-based media plugins can use to indicate that they've reached the end of the media and stopped. Added logging of priority transitions, for use in debugging issues with the peformance manager.
2009-10-27When media impls crash, don't auto-reload them without some trigger (such as ↵Monroe Linden
clicking on the object again or an incoming NAVIGATE event). This should fix the crash-reload loop issue. Also, be smarter about counting media impls for the hard cap (never count impls that aren't loaded).
2009-10-27Fix for DEV-41435 and DEV-41434 (unload media instances associated with ↵Monroe Linden
muted objects/object owners) Unloading based on object owner isn't completely reliable, because the viewer doesn't have owner data for all objects it knows about.
2009-10-26Volume controls in the media HUD should now work -- this fixes DEV-41746, ↵Monroe Linden
DEV-41748, and DEV-40782. Added LLPluginClassMedia::getVolume(). Added setVolume/getVolumeupdateVolume methods to LLViewerMediaImpl. LLViewerMedia::setVolume() now no longer overrides the volume settings on all media instances -- it now sets a "global volume" value which is multiplied by all instances' volumes to modulate them. Cleaned up volume/mute handling in LLPanelMediaHUD (made it go through the LLViewerMediaImpl interface instead of directly through LLPluginClassMedia, and removed the mMediaVolume member variable, since the media impl now stores that state).
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-19Fix for a case where the webkit plugin never generates a LOCATION_CHANGED ↵Monroe Linden
event at all.
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-08Fix for some parcel media not loading properly (DEV-39135).Monroe Linden
There were a couple of issues interacting to cause this: Firstly, when LLViewerMediaImpl delayed loading the parcel media (which it normally does), it was losing track of the specified MIME type, but the autodiscovery code also wasn't being triggered. The code should now carry through both the specified MIME type and the autodiscovery flag when loading is delayed. Second, the new media autodiscovery code might not work for some legacy parcel media content (for example, if it's stored on a server that doesn't report the correct MIME types). The code has been changed to first check whether the specified MIME type maps to a known plugin and allow that to override MIME type detection, which should allow this legacy content to keep working.
2009-10-05mergeMark Palange (Mani)
2009-10-05Fix for EXT-1301 (media_plugin_webkit dialog opens on loading the login page ↵Monroe Linden
and cannot be closed).
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
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-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
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.
2009-07-08merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> ↵Steven Bennetts
viewer-2-0 Also: * Moved media remote shortcut to Communicate menu * Changed mini map menu to toggle instead of show
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4) * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3) * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771) * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3) Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry * QAR-590 Merge Lock Request for Support Sprint * QAR-627 Merge snapshot improvements * QAR-686 Merge Lock request for Featurettes
2008-02-21Updated header comments with our public license statement that reflects ↵Callum Prentice
their public nature. DEV-10766 Not reviewed (no code changes - only comments)
2008-02-14svn merge -r 79730:79944 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-07 18:14:27 +0000