summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Expand)Author
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-19QAR-377 maintenance-6 merge:Brian McGroarty
2008-03-14svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
2008-03-04svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2008-02-19merge -r 78989:80279 Branch_1-19-0-Viewer-> releaseSteven Bennetts
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2008-02-07svn merge -r 79445:79449 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2008-01-23DEV-8923: info window does not pop up when transitioning from a Havok1 to Hav...Leyla Farazha
2007-12-29svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2007-12-21svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-12-07EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-m...Steven Bennetts
2007-12-05EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/...Don Kjer
2007-12-04EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> releaseSteven Bennetts
2007-12-03-74901 (back out premature commit to release)Steven Bennetts
2007-12-03merge -r 73391:74133 maint-ui-3 -> releaseSteven Bennetts
2007-12-01 svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9aChristian Goetze
2007-11-21svn merge -r 73148:74186 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-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
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-10-04Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-ex...Aaron Brashears
2007-09-14EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/m...Don Kjer
2007-09-13svn merge -c 68568 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-1...Josh Bell
2007-09-13Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 int...Aaron Brashears
2007-09-07SL-51287 Muted users not visibly shown anymoreSteven Bennetts
2007-08-28svn merge -r 68474:68690 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
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-08-02Merge down from Branch_1-18-1:Monroe Williams
2007-07-20svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-07-18svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint...Bryan O'Sullivan
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://...Tess Chu
2007-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-13result of merge manually performed through diff and patch. svn diff svn+ssh:/...Aaron Brashears
2007-06-04svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-05-30merge -r61423:62602 svn/branches/maintenance --> releaseKelly Washington
2007-05-08svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-04svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
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-04-11svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-31svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-03-09svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 06:29:37 +0000