summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.cpp
AgeCommit message (Collapse)Author
2010-02-25automated merge from trunkRoxie Linden
2010-02-25warn-on-failure:unix-eolRoxie Linden
automated merge from trunk
2010-02-25automated merge from trunkRoxie Linden
2010-02-25automated merge from trunkRoxie Linden
2010-02-25automated mergeRoxie Linden
2010-02-24automated mergeRoxie Linden
Don't wanna fix all windows EOL issue here warn-on-failure:unix-eol
2010-02-24Automated merge up from viewer 2.0 trunk.Roxie Linden
Some llvoiceclient changes duplicated changes that had already been made in the voice modularization refactor, so the refactor versions were used.
2009-07-15DEV-34822 viewer 1.23 mergeRoxanne Skelly
DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220