summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchat.cpp
diff options
context:
space:
mode:
authorRoxanne Skelly <roxie@lindenlab.com>2009-07-15 21:50:42 +0000
committerRoxanne Skelly <roxie@lindenlab.com>2009-07-15 21:50:42 +0000
commitff52ac089f9ed67410f80fe66d0b997f0f2dafcc (patch)
treebc0f195c198ddf3d6d338e48f79e419c246f03fa /indra/newview/llfloaterchat.cpp
parentff51d31af3d3c28e474c2831b38bbefa6f7732c5 (diff)
DEV-34822 viewer 1.23 merge
DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
0 files changed, 0 insertions, 0 deletions