Merge branch 'master' into DRTVWR-539
No related branches found
No related tags found
Showing
- autobuild.xml 7 additions, 7 deletionsautobuild.xml
- indra/media_plugins/cef/media_plugin_cef.cpp 45 additions, 8 deletionsindra/media_plugins/cef/media_plugin_cef.cpp
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/app_settings/settings.xml 0 additions, 11 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llsechandler_basic.cpp 11 additions, 3 deletionsindra/newview/llsechandler_basic.cpp
- indra/newview/llviewermedia.cpp 4 additions, 4 deletionsindra/newview/llviewermedia.cpp
- indra/newview/skins/default/xui/en/panel_preferences_setup.xml 15 additions, 30 deletions.../newview/skins/default/xui/en/panel_preferences_setup.xml
- indra/newview/viewer_manifest.py 3 additions, 5 deletionsindra/newview/viewer_manifest.py
Loading
Please register or sign in to comment