summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.h
AgeCommit message (Expand)Author
2010-05-04Automated mergeRoxie Linden
2010-05-04re-merge e7cef87fae39 - EXT-6031 refactoring of voice volume representationRoxie Linden
2010-04-19CR Changes from AimeeRoxie Linden
2010-04-14DEV-48904 - p2p acceptance dialog vanishes too quicklyRoxie Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-03-01Automated merge from trunkRoxie Linden
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-25automated merge from trunkRoxie Linden
2010-02-24Automated merge up from viewer 2.0 trunk.Roxie Linden
2009-07-15DEV-34822 viewer 1.23 mergeRoxanne Skelly