summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.h
AgeCommit message (Collapse)Author
2008-01-17QAR-211: Logical merge of:Josh Bell
svn merge -r 76578:76594 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxbhear-based-on-release-r76573 svn merge -r 77016:77668 svn+ssh://svn.lindenlab.com/svn/linden/branches/scrolllist_fixes svn merge -r 75889:75948 svn+ssh://svn.lindenlab.com/svn/linden/branches/simcrash-economy-fix svn merge -r 77312:77356 svn+ssh://svn.lindenlab.com/svn/linden/branches/revoke-gods plus addition to MANIFEST for revoke-gods Actual merge: svn merge -r 77525:77696 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-01-15-a * QAR-177 Linux Voice Support Merge BuildMe * QAR-197 merge of scrolllist_fixes into release for 1.19.0 (plus QAR-216 additions) * QAR-194 simcrash-economy-fix * QAR-201 Revoke gods added to deploy
2008-01-12svn merge -r76807:77355 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Pick up fixes made to 1.18.6 Viewer, including: * DEV-8584 Replace "Second Life" with Channel name in viewer crash log reports * DEV-8384 Connect button doesn't enable * DEV-8408 Unable to edit First/last name and password fields in viewer login * DEV-8423 VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates * DEV-8557 Crash on login page when using Logitech LCD Keyboard * DEV-8507 Crash reporter has no default server to send to when crashing before agent connect * DEV-8531 viewer_manifest.py broken for 64-bit builds * DEV-8286 German Translation of the "Release Keys" tab is incorrect * DEV-7419 Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667) * DEV-6851 Integrate html error page with client
2007-12-19svn merge -r 75354:76103 ↵Jon Wolk
svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-05EFFECTIVE 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-11-15merge 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-11-01svn merge -r 72652:72881 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release QAR-11: pair-reviewed the merge w/ Sam.
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result 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-09-11Merge sl-search-m0 back into releaseSam Kolb
2007-08-30Merge sl-search-opt-in back into the release branchSam Kolb
Reviewed by Josh and Don
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-04-04svn merge -r 59826:59968 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-02-17merge -r 56779:58057 /branches/selection_managementRichard Nelson
2007-01-23merge -r 56842:57026 maintenance.Steven Bennetts
2007-01-02Print done when done.James Cook