summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingssecurity.cpp
AgeCommit message (Collapse)Author
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-02-04EXT-3144 EXT-4226: Re-employ tentative state for individual items in media ↵Rick Pasetto
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.
2009-12-16Simple fix for DEV-44111 ( whitelist appears disabled if first whitelist ↵callum
entry fails)
2009-12-09Bunch of simple UI changes:callum
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-11-30Merge with tipcallum
2009-11-30Fix for DEV-41951 - reworking of whitelist so it's more usable.callum
2009-11-30DEV-43041 DEV-41648 - disable OK and Apply if the media data is the same as ↵Rick Pasetto
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-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24Removed include llnotifications.h from llfloater.h trying to speed buildsJames Cook
Fixed many other includes related to this file. Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-18Switch some files to Unix line endingsBryan O'Sullivan
2009-11-09PARTIAL FIX (workaround) DEV-41949: LLMediaEntry::setWhitelist() and ↵Rick Pasetto
LLMediaEntry::asLLSD() have a contract conflict Review #31 So, here's what was happening, briefly: - LLMediaEntry::setWhitelist() would be a no-op if given an LLSD that did not have a WHITELIST_KEY - LLMediaEntry::asLLSD() would render the LLMediaEntry *without* a WHITELIST_KEY if the whitelist was empty Therefore, when the viewer marshalled an LLMediaEntry for the server, it would send it without a WHITELIST_KEY. When the server got it, it would not erase the last value. This is actually a workaround: it patches asLLSD() with an LLSD::emptyArray() if the key is not there. However, this should be fixed on the server: in either or both of the following ways: 1) LLMediaEntry::setWhitelist() should not be a no-op if the LLSD has no WHITELIST_KEY: it should erase the whitelist 2) LLMediaEntry::asLLSD() should render an empty whitelist in WHITELIST_KEY as an empty array Note that both could be done and still work. A unit test should and will be written next.
2009-11-09FIX DEV-42093 - Make sure to navigate home if current URL is empty on "Apply"Rick Pasetto
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-03update from viewer2 and merge into avpEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-11-03mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-02 EXT-1738 [BSI] Manage Telehub... in Region/Estate floater silently fails ↵angela
when clicked
2009-10-15Fixed defect for URLs that already have a schemecallum
See http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=18
2009-10-15https://jira.lindenlab.com/jira/browse/DEV-40649callum
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-07DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed ↵Jiao Li
by rick
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.