| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-04-19 | merge changes for DRTVWR-294 | Oz Linden | |
| 2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
| 2013-03-11 | merge | prep | |
| 2012-07-30 | merge | Brad Payne (Vir Linden) | |
| 2012-07-13 | fix for SH-3235: Bump maps are not loaded until objects change LOD | Xiaohong Bao | |
| 2012-07-13 | SH-3267 WIP - extract cof version from avatar appearance message, use to ↵ | Brad Payne (Vir Linden) | |
| reject stale updates | |||
| 2012-07-12 | SH-3267 WIP | Brad Payne (Vir Linden) | |
| 2012-06-28 | SH-3228 WIP - always respond to processAppearance for self, convert baked ↵ | Brad Payne (Vir Linden) | |
| textures to checkerboards | |||
| 2011-08-12 | merge from viewer-experience | Leyla Farazha | |
| 2011-07-19 | addendum to prim fix | Brad Payne (Vir Linden) | |
| 2011-07-19 | Cherry pick of ↵ | Brad Payne (Vir Linden) | |
| https://bitbucket.org/lindenlab/mesh-development/changeset/9cea44ebea3b by don, to fix old viewer crashes in mesh regions | |||
| 2011-04-04 | Automated merge up from viewer-development into mesh-development | Loren Shih | |
| 2011-04-01 | VWR-24487 make PREHASH variables char const* const | Boroondas Gupte | |
| 2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
| 2010-10-01 | Rough draft of physics display better matching what's on the sim. | Dave Parks | |
| 2010-08-24 | Backed out changeset c3d41f18ce2b | Tofu Linden | |
| back-out the back-out for this branch. yay. | |||
| 2010-08-24 | Backed out changeset a62bf7c0af21 | Tofu Linden | |
| Backing out this merge that I pushed (prematurely) to the wrong place. | |||
| 2010-08-24 | merge heads. whew. | Tofu Linden | |
| 2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
| 2010-02-02 | Trying to resolve a strange crash in LLUUID::isNull()... by avoiding it for now. | Tofu Linden | |
| 2010-02-02 | Trying to resolve a strange crash in LLUUID::isNull()... by avoiding it for now. | Tofu Linden | |
| 2010-02-01 | start to abstract-out the 'is a spotlight' question so one day we can ↵ | Tofu Linden | |
| perhaps make the UI hurt less. | |||
| 2010-02-01 | start to abstract-out the 'is a spotlight' question so one day we can ↵ | Tofu Linden | |
| perhaps make the UI hurt less. | |||
| 2009-11-02 | Sync up with render-pipeline-7 ignore-dead-branch | David Parks | |
| 2009-10-16 | svn merge -r134817:136516 ↵ | Loren Shih | |
| svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-32867 : Avatar Pipeline Project - Multi-Attachments This is a viewer-side-only, infrastructure-only merge for multi-attachments. This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly. Reviewed by: Vir. | |||
| 2009-09-22 | Merging render-pipeline-6-qa-2 into viewer-2 | David Parks | |
| Self reviewed. | |||
| 2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
| ignore-dead-branch | |||
| 2009-04-01 | QAR-1284 ip-takedown tools simulator work is ready for merge | Andrew Meadows | |
| svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5 no conflicts | |||
| 2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
| svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
| 2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
| dataserver-is-deprecated | |||
| 2008-04-03 | svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release | Kelly Washington | |
| HAVOK4 IN TEH HOUSE!!11!!ONE!! If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this. QAR-448 | |||
| 2007-12-05 | EFFECTIVE MERGE: svn merge -r 71520:73420 ↵ | Don Kjer | |
| svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release | |||
| 2007-10-10 | svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 | Christian Goetze | |
| 2007-10-04 | Result of svn merge -r71162:71205 ↵ | Aaron Brashears | |
| svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | |||
| 2007-07-02 | svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
| release | |||
| 2007-05-23 | svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 ↵ | Brad Kittenbrink | |
| svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release | |||
| 2007-03-06 | merge -r 58641:58711 maintenance -> release | Steven Bennetts | |
| 2007-01-02 | Print done when done. | James Cook | |
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |