Merged master into DRTVWR-486
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- README.md 0 additions, 1 deletionREADME.md
- autobuild.xml 7 additions, 7 deletionsautobuild.xml
- indra/llplugin/llpluginclassmedia.cpp 4 additions, 0 deletionsindra/llplugin/llpluginclassmedia.cpp
- indra/media_plugins/cef/media_plugin_cef.cpp 33 additions, 9 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 3 additions, 3 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llappviewer.cpp 7 additions, 3 deletionsindra/newview/llappviewer.cpp
- indra/newview/llpanelprimmediacontrols.cpp 26 additions, 2 deletionsindra/newview/llpanelprimmediacontrols.cpp
- indra/newview/llpanelprimmediacontrols.h 1 addition, 0 deletionsindra/newview/llpanelprimmediacontrols.h
- indra/newview/lltoolpie.cpp 19 additions, 2 deletionsindra/newview/lltoolpie.cpp
- indra/newview/lltoolpie.h 1 addition, 0 deletionsindra/newview/lltoolpie.h
- indra/newview/llviewermedia.cpp 12 additions, 0 deletionsindra/newview/llviewermedia.cpp
- indra/newview/llviewermedia.h 1 addition, 0 deletionsindra/newview/llviewermedia.h
- indra/newview/llviewermediafocus.cpp 15 additions, 2 deletionsindra/newview/llviewermediafocus.cpp
- indra/newview/llviewermediafocus.h 4 additions, 2 deletionsindra/newview/llviewermediafocus.h
- indra/newview/llviewerparcelmedia.cpp 7 additions, 0 deletionsindra/newview/llviewerparcelmedia.cpp
- indra/newview/viewer_manifest.py 52 additions, 44 deletionsindra/newview/viewer_manifest.py
Loading
Please register or sign in to comment