Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/
Showing
- indra/cmake/00-Common.cmake 4 additions, 4 deletionsindra/cmake/00-Common.cmake
- indra/llaudio/CMakeLists.txt 2 additions, 4 deletionsindra/llaudio/CMakeLists.txt
- indra/llaudio/llaudiodecodemgr.cpp 0 additions, 1 deletionindra/llaudio/llaudiodecodemgr.cpp
- indra/llui/lltooltip.cpp 1 addition, 1 deletionindra/llui/lltooltip.cpp
- indra/newview/CMakeLists.txt 2 additions, 1 deletionindra/newview/CMakeLists.txt
- indra/newview/llfloatermediasettings.cpp 46 additions, 9 deletionsindra/newview/llfloatermediasettings.cpp
- indra/newview/llfloatermediasettings.h 9 additions, 3 deletionsindra/newview/llfloatermediasettings.h
- indra/newview/llpanelmediasettingsgeneral.cpp 9 additions, 9 deletionsindra/newview/llpanelmediasettingsgeneral.cpp
- indra/newview/llpanelmediasettingssecurity.cpp 1 addition, 1 deletionindra/newview/llpanelmediasettingssecurity.cpp
- indra/newview/llstatusbar.cpp 9 additions, 2 deletionsindra/newview/llstatusbar.cpp
- indra/newview/llstatusbar.h 2 additions, 1 deletionindra/newview/llstatusbar.h
- indra/newview/llviewerfloaterreg.cpp 2 additions, 0 deletionsindra/newview/llviewerfloaterreg.cpp
- indra/newview/skins/default/xui/en/panel_media_settings_general.xml 17 additions, 6 deletions...iew/skins/default/xui/en/panel_media_settings_general.xml
- indra/newview/skins/default/xui/en/panel_status_bar.xml 11 additions, 0 deletionsindra/newview/skins/default/xui/en/panel_status_bar.xml
Loading
Please register or sign in to comment