summaryrefslogtreecommitdiff
path: root/scripts/messages/message_template.msg
AgeCommit message (Expand)Author
2010-02-11Update message template to agree with server-1-36Kent Quirk
2010-01-19DEV-45037 Attackers can request files from viewer cacheSoft Linden
2009-10-19mergeSteve Bennetts
2009-10-16Cosmetic change. Took out unnecessary blank line near the end of LinkInvento...Loren Shih
2009-09-26Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20Nat Goodspeed
2009-09-17Fix error with message template incompatibility for LinkInventoryItem.Merging...James Cook
2009-09-04svn merge -r132607:132665 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Christian Goetze
2009-07-29svn merge -c 128669 svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-4Dave Simmons
2009-07-24For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"Loren Shih
2009-06-24merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-...Loren Shih
2009-05-19svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-05-18Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_da...Aaron Brashears
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
2009-04-21svn merge -r117696:117697 svn+ssh://svn.lindenlab.com/svn/linden/branches/fix...Kelly Washington
2009-03-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-02-25svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2008-12-04Merging from server/server-1.25 back to trunk.Robert Knop
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-10-07Roll back of r98854 Accidentally commited merge in progressMark Palange
2008-10-07merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-10-07svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
2008-07-23svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-pi...Karl Steifvater
2008-07-22svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> re...Josh Bell
2008-07-22merge uv-picking branch.Karl Steifvater
2008-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
2008-04-28svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-04-08svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9Leyla Farazha
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-12-06EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/F...Don Kjer
2007-11-21svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-11-15merge of age verification changes from QAR-76 to release; changes were origin...Kent Quirk
2007-11-02Committing viewer-auth-server into release svn merge -r72818:72835 svn+ssh://...Leyla Farazha
2007-09-19Passed QA, merging minifriends-3:70006 back to releaseMelinda Green
2007-08-30Merge sl-search-opt-in back into the release branchSam Kolb
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/m...Christian Goetze
2007-08-10merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by ...Tess Chu
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://...Tess Chu
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn....Brad Kittenbrink
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-01-31merge release@57486 release-candidate@57503Steven Bennetts
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts
2007-01-02Print done when done.James Cook