summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmedia.cpp
AgeCommit message (Collapse)Author
2010-08-17Viewer side changes to support javascript window.close handling.Monroe Linden
2010-04-20Fixed EXT-6542(normal) - [HARD CODED] - Land-Info, Medien: none/none needs ↵Dmitry Zaporozhan
to be localized Added "DefaultMimeType" string to strings.xml to make "none/none" mime type localizable. Replaced all occurrences of "none/none" string with call to static method. Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/265/ --HG-- branch : product-engine
2010-03-17Fix for EXT-5975: don't display a toast warning for none/none parcel media ↵Monroe Linden
mime type Modified LLParcelMediaAutoPlay and LLParcelMedia so that it should no longer attempt to create media instances when the media type is set to "none/none". Also, made LLViewerParcelMedia::getURL() return an empty string when the media type is none/none, which should make the UI better reflect the fact that it won't be loaded. Reviewed by Callum at http://codereview.lindenlab.com/686010
2010-02-08Fixed major bug EXT-5022 (streaming media first use dialog should be removed)Eugene Mutavchi
--HG-- branch : product-engine
2010-01-25"Fix" confusion over media settingsRick Pasetto
Review #89 This implements the changes Sam wanted in order to reduce the confusion over media enabled-ness, in particular: - "Media Enabled" pref now only controls "AudioStreamingMedia" - No more "tentative" state - New "Music Enabled" pref - First run dialog controls Media and Music (Sam, this is a change from your request...I think it works better) - Put a reflection of the "Media Enabled" checkbox in the Nearby Media Floater - Get rid of the "AudioStreamingVideo" setting altogether (whatever used it, it should now obey "AudioStreamingMedia").
2010-01-21Minor cleanup to the logic in LLViewerParcelMedia::play(), to prevent ↵Monroe Linden
duplication of code.
2010-01-14EXT-3795 First run messages still display (click & drag on map, Build tools ↵angela
open, movement controlled, etc)
2010-01-11Backed out changeset b6030bb6ff40Rick Pasetto
2010-01-10Reverting change that broke the build so we can get a working build for QAKent Quirk
2010-01-08Made AudioStreamingMedia setting control loading of prim media as well as ↵Monroe Linden
parcel media. Moved the media first-run dialog code from llviewerparcelmedia.cpp to llviewermedia.cpp, and made it come up for both prim and parcel media.
2010-01-05Lots of fixes to parcel audio playing/stopping/autoplaying/firstuse policy.Tofu Linden
2010-01-05DEV-44775 pref incorrectly named 'AudioSteamingMedia' in many placesTofu Linden
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-20Delete the media impl instead of just unloading it. From Review #41 feedback.Rick Pasetto
2009-11-19Push the policy that "back", "forward" and "stop" do different things out of ↵Rick Pasetto
LLViewerMedia. Now, LLViewerMedia has explicit skipBack() and skipForward() functions, and the buttons in LLPanelPrimMediaControls now map onto those functions neatly.
2009-11-13Add functionality to nearby media floater: parcel media & autoplayRick Pasetto
This change implements the enabling/disabling of parcel media, as well as setting the user's autoplay preference. I still am quite confused by this UI, so we'll need to play with it a bit to ensure it is what we want to present to users. This adds a few helpers to llviewerparcelmedia to get the name and URL of media.
2009-11-09LLViewerMediaImpl now keeps track of which instance is the current parcel ↵Monroe Linden
media instance. The active parcel media instance always gets priority over other inworld media.
2009-10-15Fix for another "case not handled in switch" due to the addition of ↵Monroe Linden
MEDIA_EVENT_NAME_CHANGED.
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-05Fixes for a different class of plugin failures (where loading the plugin dll ↵Monroe Linden
fails) causing an error message loop: Made LLPluginProcessParent differentiate between failures launching/loading the plugin and failures after the plugin has been loaded. This allows us to handle launch failures differently, since retrying is unlikely to fix them. Added new media event MEDIA_EVENT_PLUGIN_FAILED_LAUNCH to indicate a launch failure. Added a case for the new event to LLViewerMediaImpl::handleMediaEvent() that sets the "failed init" flag to prevent retries.
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-27Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.James Cook
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
2009-07-07DEV-34720 Mute allJiao Li
DEV-34721 "Streaming Media" checkbox DEV-34723 Mouse sensitivity slider Reviewed by James
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-05svn merge -r106715:HEAD ↵Kent Quirk
svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-05-09QAR-537 Viewer 1.20 RC 6Steven Bennetts
merge -r 86279:86925 Branch_1-20-Viewer -> release
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
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-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ↵Steven Bennetts
79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191
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-12-23 10:57:43 +0000