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 | |
2012-08-17 | Expanding region flags to 64 bits. Adding region protocol flags | Don Kjer | |
2011-01-10 | STORM-807 : Clean up code as discussed with Andrew | Merov Linden | |
2010-12-22 | merge | Andrew Meadows | |
2010-11-18 | Added viewer-side "object overlaps parcel" check encroachment returnabilty UI | Andrew Meadows | |
Reviewed with Falcon | |||
2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
2009-12-10 | DEV-44138 About Land - Access tab - make AO overriden options clear | Soft Linden | |
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-12-04 | Merging from server/server-1.25 back to trunk. | Robert Knop | |
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Conflicts resolved by Prospero, except for one scary conflict in SendConfirmationEmail.php which was resolved by jarv. | |||
2008-07-31 | svn merge -r93014:93396 ↵ | Dave Hiller | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 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 | |||
2008-03-19 | QAR-377 maintenance-6 merge: | Brian McGroarty | |
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/ | |||
2007-11-15 | merge of age verification changes from QAR-76 to release; changes were ↵ | Kent Quirk | |
originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112. | |||
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-08-30 | Merge sl-search-opt-in back into the release branch | Sam Kolb | |
Reviewed by Josh and Don | |||
2007-06-13 | result of merge manually performed through diff and patch. svn diff ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release | |||
2007-05-02 | svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
release | |||
2007-01-17 | merge release@56803 release-candidate@56833 | Steven Bennetts | |
2007-01-02 | Print done when done. | James Cook | |