Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
No related branches found
No related tags found
Showing
- indra/llplugin/slplugin/slplugin.cpp 72 additions, 28 deletionsindra/llplugin/slplugin/slplugin.cpp
- indra/llui/llprogressbar.cpp 5 additions, 4 deletionsindra/llui/llprogressbar.cpp
- 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/llpanelprimmediacontrols.cpp 39 additions, 32 deletionsindra/newview/llpanelprimmediacontrols.cpp
- indra/newview/llpanelprimmediacontrols.h 8 additions, 0 deletionsindra/newview/llpanelprimmediacontrols.h
- indra/newview/llviewermediafocus.cpp 0 additions, 9 deletionsindra/newview/llviewermediafocus.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_prim_media_controls.xml 22 additions, 17 deletions...ewview/skins/default/xui/en/panel_prim_media_controls.xml
Loading
Please register or sign in to comment