summaryrefslogtreecommitdiff
path: root/indra/newview/llcallfloater.cpp
AgeCommit message (Collapse)Author
2009-07-15DEV-34822 viewer 1.23 mergeRoxanne Skelly
DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220