summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingssecurity.cpp
AgeCommit message (Collapse)Author
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.