summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llprimitive.cpp
AgeCommit message (Expand)Author
2011-04-04Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-04-01VWR-24487 make PREHASH variables char const* constBoroondas Gupte
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-28CID-331Tofu Linden
2009-11-07Fix for missing LOD spam.Dave Parks
2009-11-05Fix for prims all being 0 lod.Dave Parks
2009-11-05Fix for crash on teleport to mesh enabled region.Dave Parks
2009-11-02Repairing things that didn't quite merge properly.Palmer
2009-11-02Merge of viewer-2-0 changesPalmer
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
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-07svn merge -r 126003:126087 svn+ssh://svn/svn/linden/qa/light-texture-params...Don Kjer
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-04-01QAR-1284 ip-takedown tools simulator work is ready for mergeAndrew Meadows
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-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington
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-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn....Brad Kittenbrink
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-03-20svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroi...Karen Clark
2007-03-07merge release@58791 vc8@58828 -> releaseSteven Bennetts
2007-03-06merge -r 58641:58711 maintenance -> releaseSteven Bennetts
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 06:28:43 +0000