summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchatvoicevolume.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-06-16 14:35:23 -0400
committerOz Linden <oz@lindenlab.com>2014-06-16 14:35:23 -0400
commit142e8edcd334b6119a74a7ce93c9823ad82bc052 (patch)
treee0986cbf1d7d1da6ab9c511e9249be795d779415 /indra/newview/llfloaterchatvoicevolume.h
parente15002a11cf5081e0697065cb017ba0af6c4b32d (diff)
correct merge mistake
Diffstat (limited to 'indra/newview/llfloaterchatvoicevolume.h')
0 files changed, 0 insertions, 0 deletions