summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Expand)Author
2010-02-01Use "standard" llsd::equalsRick Pasetto
2010-01-29CID-329Tofu Linden
2010-01-29CID-330Tofu Linden
2010-01-28CID-331Tofu Linden
2009-11-28Migrated LLUUIDs and some float constants out of headers into .cpp filesJames Cook
2009-11-10Fix for Windows compile error.Steve Bennetts
2009-11-10FIX DEV-41949: LLMediaEntry::setWhitelist() and LLMediaEntry::asLLSD() have a...Rick Pasetto
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-10-19mergeSteve Bennetts
2009-10-16svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-10-07Merged latest viewer/login-api with latest viewer/viewer-20brad kittenbrink
2009-10-05FIX DEV-40877: ignore changes from "bad" objects which have an invalid media URLRick Pasetto
2009-10-05merge with latest from lindenlab/svn-imports-viewer-20Mark Palange (Mani)
2009-10-04Changed license to Viewer GPL to try to fix the Linux build export. Code con...James Cook
2009-10-02Patches follow merge to latest viewer-20 updatesMark Palange (Mani)
2009-10-02merge of latest viewer/viewer-20Mark Palange (Mani)
2009-10-01merge of latest lindenlab/svn-imports-viewer-20Mark Palange (Mani)
2009-10-01svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams
2009-09-30QAR-1619: merge up to 2009-09-26 viewer/viewer-20Nat Goodspeed
2009-09-26Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20Nat Goodspeed
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-01Fix up some more post-merge breakage.brad kittenbrink
2009-08-31Merge with trunkBryan O'Sullivan
2009-07-29svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737Christian Goetze
2009-07-15svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691Christian Goetze
2009-07-07svn merge -r 126003:126087 svn+ssh://svn/svn/linden/qa/light-texture-params...Don Kjer
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-04-01QAR-1284 ip-takedown tools simulator work is ready for mergeAndrew Meadows
2009-02-25svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-02-03svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewe...Mark Palange
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-12-01svn merge -r103586:104391 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2008-10-10svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andre...Andrew Meadows
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
2008-04-03Fix mac build from havok4 merge.Kelly Washington
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2007-12-05EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/...Don Kjer
2007-10-11EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/m...Don Kjer
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-08-30Merge sl-search-opt-in back into the release branchSam Kolb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 20:51:26 +0000