Commit Graph

5 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Rick Pasetto 2e70e4e2d7 Add functionality to nearby media floater: parcel media & autoplay
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-13 12:59:17 -08:00
Monroe Williams 745845f799 svn merge -r 129841:129910 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-08-27 19:00:18 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Callum Prentice 34527df740 Updated header comments with our public license statement that reflects their public nature. DEV-10766
Not reviewed (no code changes - only comments)
2008-02-21 21:25:17 +00:00
Josh Bell 98fd90ddd6 svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media

Sam made me do it.
2008-02-14 01:45:59 +00:00