summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
AgeCommit message (Expand)Author
2009-09-29merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-01Fix up some more post-merge breakage.brad kittenbrink
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-12merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https:...Steven Bennetts
2009-07-30merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/...Steven Bennetts
2009-07-15DEV-34822 viewer 1.23 mergeRoxanne Skelly
2010-02-01Merge giab-viewer-trunk 2497, general merge of moreRoxie Linden
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-03-19svn merge -r 114639:114640 svn+ssh://svn.lindenlab.com/svn/linden/branches/qa...Monroe Williams
2009-02-27svn merge -r 113014:113017 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams
2009-02-03svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewe...Mark Palange
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-05svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/not...Kent Quirk
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-15svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-...Jon Wolk
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-05-19EFFECTIVE MERGES:Don Kjer
2008-05-14Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .Eric Tulla
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://sv...Brian McGroarty
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenl...Brian McGroarty
2008-04-22QAR-468 "Babble Lipsync MergeMe"Adam Moss
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-20merge release@82383 viewer-cleanup2-7-merge@82828Steven Bennetts
2008-03-15reverting premature commit at 82410.Steven Bennetts
2008-03-14[NOTE: This was an erroneous commit, and was reverted in the next revision]Mark Palange
2008-02-26QAR-279 Improved Voice volume management & Linux VoiceAdam Moss
2008-02-01merge Branch_1-19-0-Viewer -r 78432:78989 -> releaseSteven Bennetts
2008-01-24svn merge -r 77416:78126 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Jon Wolk
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-22svn merge -r 71902:71933 svn+ssh://svn.lindenlab.com/svn/linden/branches/expi...Jon Wolk
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-09-14EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/m...Don Kjer
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/m...Christian Goetze
2007-08-14svn merge -r 67483:67657 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 17:25:20 +0000