Age | Commit message (Collapse) | Author |
|
|
|
streamlined LLUICtrlFactory's interface
|
|
removed redundant functionality
moved buildPanel to LLPanel
|
|
|
|
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.
|
|
entry fails)
|
|
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
|
|
|
|
|
|
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.
|
|
Cuts number of includes of llnotifications.h from 300+ to 40.
|
|
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
|
|
|
|
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.
|
|
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.
|
|
--HG--
branch : avatar-pipeline
|
|
--HG--
branch : avatar-pipeline
|
|
when clicked
|
|
See http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=18
|
|
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.
|
|
by rick
|
|
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.
|