Commit Graph

31 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
angela 3f6a19ddd3 EXT-5172 prefs review: Allow media to auto-play should be set by default 2010-02-16 19:03:49 +08:00
angela 3684b437a0 EXT-5164 Me->My Inventory opens Inventory floater, not side panel 2010-02-11 23:30:01 +08:00
Rick Pasetto 9dd41cdcee EXT-3144 EXT-4226: Re-employ tentative state for individual items in media settings
Review #95

This change undoes some prior change that seems to not allow showing
media data for multiple selection. There was all of this code put in
to support displaying tentative state for media, but code was added to
basically override it. Perhaps the reason was tentative state items
were not ignored on apply...this change does that.
2010-02-04 11:24:54 -08:00
callum 894a5006b3 Fix for DEV-44045 "Update text, checkbox & layout changes for Build : Media Settings : Controls tab" 2009-12-14 13:20:23 -08:00
callum dc3cad90c1 Bunch of simple UI changes:
DEV-43885 EXT-3206: Number of media items UI in Nearby Media Floater clipped when there are a lot
DEV-43884 EXT-3207: In Build Dialog, Under Texture Tab, should say "Media" and not "Media URL"
DEV-43877 EXT-3221: Warning message about whitelists in Security Tab of Media settings floater appears incorrectly
DEV-43875 EXT-3224: Media Text Box in the Build settings: Texture should be a label and not a text box
DEV-43477 Popup for adding media to only one face is misleading
Reviewed by Sam
2009-12-09 14:55:17 -08:00
callum 532a8ed056 Merge with tip 2009-11-30 17:14:37 -08:00
callum d90aea0ede Fix for DEV-41951 - reworking of whitelist so it's more usable. 2009-11-30 17:13:41 -08:00
Rick Pasetto 5040a72675 DEV-43041 DEV-41648 - disable OK and Apply if the media data is the same as the initial
Review #48

This change kills two birds with one stone: every frame, we check to see if the media data is the same as the one we 'initialize' with. If it is, we disable OK and Cancel. Otherwise we enable them. This makes it very difficult to set empty media data, as well as fixing the "apply button doesn't grey out" bug.
2009-11-30 16:01:20 -08:00
James Cook 957055396d merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp 2009-11-25 12:31:24 -08:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
James Cook 458430be91 Removed include llnotifications.h from llfloater.h trying to speed builds
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
Rick Pasetto a49862a4fc FIX DEV-41999: don't set home URL if "Multiple Media"
Review #44
2009-11-24 16:48:20 -08:00
Monroe Linden 6cb4b27897 Fix for DEV-42161 (LLViewerMediaImpl::navigateInternal spam when editing object properties).
Made LLPanelMediaSettingsGeneral::updateMediaPreview() only do a navigate when the URL actually changes.
2009-11-13 14:48:24 -08:00
Rick Pasetto ebbb468a79 FIX DEV-42093 - Make sure to navigate home if current URL is empty on "Apply"
This change gets rid of the crufty (and confusing) "apply()"
functions from llpanelmediasettings*.  Those functions were
never being called, yet changes were being made in them.

Instead, I added "preApply()" and "postApply()" to each of
these panels, which the floater (who really does the "apply()"ing)
now calls before and after it applies the changes to the
media data.
2009-11-09 16:56:33 -08:00
Rick Pasetto 113c7edf60 FIX DEV-41587: Update current URL in draw()
The current URL is now re-fetched from the current selection.
Also did some minor refactoring
2009-11-06 12:21:21 -08:00
Loren Shih 0dd9871012 merge
--HG--
branch : avatar-pipeline
2009-11-03 14:02:02 -05:00
callum 5702da187d Implementation for DEV-41993
Mutes media on preview widget in media settings/general panel
2009-10-30 12:53:13 -07:00
callum 3008b3fdc0 Main change is pointing install.xml for Windows to new version of LLQtWebKit that has DLLs with no manifest as per recent build change.
Tweaked bookamrks for test app too.
Finally, added fix for DEV-41392 (Home URL Preview should be next to the Home URL)
2009-10-23 16:19:04 -07:00
callum f7e4f1d1a5 DEV-41721 - "Alt-image enabled" is not yet functional: remove from UI 2009-10-22 15:32:22 -07:00
Mark Palange (Mani) b4275c5d48 merge 2009-10-16 18:13:53 -07:00
Mark Palange (Mani) 3e10fa4d51 merge from latest svn/viewer-2-0 to hg/viewer-2-0 2009-10-16 16:42:45 -07:00
callum 893fc8afa7 Merge to update new version number. 2009-10-15 15:33:32 -07:00
callum 3831ca912e https://jira.lindenlab.com/jira/browse/DEV-40649
Media auto refreshes after Whitelist set
This checkin fixes a related issue to this task and prohibits user from (A) adding an item to the whitelist that would invalidate the home URL and (b) adding a home URL that would not pass the whitelist.
2009-10-15 11:29:14 -07:00
skolb 1b1550f284 Merge 2009-10-14 10:10:46 -07:00
Jiao Li 25f3546626 Reset Current URL -- to be reviewed 2009-10-13 15:34:31 +00:00
skolb 1d63b14548 Merge changes to llpanelmediasettingsgeneral to handle reset button 2009-10-12 11:24:14 -07:00
Monroe Linden c69ead5895 Bringing in some changes from Rick. 2009-10-07 17:24:13 -07:00
James Cook ec84b639ed EXT-1339 Create onClose method in LLFloater, and remove most bindings to mCloseSignal. In the vast majority of cases, mCloseSignal is being bound to an onClose function. Just make it virtual and be done with it. Renamed a couple of LLPanel close methods to onClosePanel() to distinguish them. Reviewed with Richard. 2009-10-07 20:54:31 +00:00
Rick Pasetto df48e66f7c DEV-39168 - bounce back to the current URL (or, the home URL if current URL is "") if the server denies navigation
This refactors some of the bounceBack code into LLVOVolume.
It also changes an important rule:  the edit panel now *will* send the
current URL to the server when you hit "OK".  This change was done so
that if autoplay is on, we make sure the server gets the right data.
2009-10-07 12:26:42 -07:00
Jiao Li a99449bea1 DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed by rick 2009-10-07 08:18:51 +00:00
Monroe Williams cf9239cabc svn merge -r 134922:134973 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-10-01 02:35:53 +00:00