summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.cpp
AgeCommit message (Expand)Author
2010-02-24automated mergeRoxie Linden
2010-02-24Automated merge up from viewer 2.0 trunk.Roxie Linden
2009-07-15DEV-34822 viewer 1.23 mergeRoxanne Skelly