| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
| 2009-11-10 | FIX DEV-41949: LLMediaEntry::setWhitelist() and LLMediaEntry::asLLSD() have ↵ | Rick Pasetto | |
| a contract conflict Review #32 This code will go into both server 1.32 branch and the viewer branch. As proposed in DEV-41949, I've changed setWhitelist(const LLSD &whitelist) to clear the whitelist if the WHITELIST_KEY is not present in the passed-in 'whitelist'. I've also made sure that asLLSD() ensures that the WHITELIST_KEY is erased in the given LLSD. | |||
| 2009-11-04 | Redo Bao's broken merge | Bryan O'Sullivan | |
| 2009-10-01 | svn 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. | |||
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |