-
- Downloads
DEV-34822 viewer 1.23 merge
DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220
Showing
- indra/newview/CMakeLists.txt 4 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/logcontrol.xml 2 additions, 4 deletionsindra/newview/app_settings/logcontrol.xml
- indra/newview/app_settings/settings.xml 55 additions, 0 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llagent.cpp 1 addition, 1 deletionindra/newview/llagent.cpp
- indra/newview/llappviewer.cpp 3 additions, 4 deletionsindra/newview/llappviewer.cpp
- indra/newview/llavataractions.cpp 1 addition, 1 deletionindra/newview/llavataractions.cpp
- indra/newview/llbottomtray.cpp 1 addition, 1 deletionindra/newview/llbottomtray.cpp
- indra/newview/llcallfloater.cpp 15 additions, 18 deletionsindra/newview/llcallfloater.cpp
- indra/newview/llfloaterabout.cpp 12 additions, 2 deletionsindra/newview/llfloaterabout.cpp
- indra/newview/llfloaterchatterbox.cpp 1 addition, 1 deletionindra/newview/llfloaterchatterbox.cpp
- indra/newview/llfloatervoicedevicesettings.cpp 17 additions, 21 deletionsindra/newview/llfloatervoicedevicesettings.cpp
- indra/newview/llimpanel.cpp 7 additions, 7 deletionsindra/newview/llimpanel.cpp
- indra/newview/llimview.cpp 13 additions, 12 deletionsindra/newview/llimview.cpp
- indra/newview/llinspectavatar.cpp 3 additions, 3 deletionsindra/newview/llinspectavatar.cpp
- indra/newview/lllogininstance.cpp 1 addition, 0 deletionsindra/newview/lllogininstance.cpp
- indra/newview/lloutputmonitorctrl.cpp 4 additions, 4 deletionsindra/newview/lloutputmonitorctrl.cpp
- indra/newview/lloutputmonitorctrl.h 1 addition, 1 deletionindra/newview/lloutputmonitorctrl.h
- indra/newview/lloverlaybar.cpp 1 addition, 1 deletionindra/newview/lloverlaybar.cpp
- indra/newview/llpanelimcontrolpanel.cpp 1 addition, 1 deletionindra/newview/llpanelimcontrolpanel.cpp
- indra/newview/llparticipantlist.cpp 1 addition, 2 deletionsindra/newview/llparticipantlist.cpp
Loading
Please register or sign in to comment