Pull merge from lindenlab/viewer-release
No related branches found
No related tags found
Showing
- .hgtags 1 addition, 0 deletions.hgtags
- autobuild.xml 6 additions, 6 deletionsautobuild.xml
- indra/cmake/Copy3rdPartyLibs.cmake 3 additions, 1 deletionindra/cmake/Copy3rdPartyLibs.cmake
- indra/cmake/FMODEX.cmake 1 addition, 1 deletionindra/cmake/FMODEX.cmake
- indra/llaudio/llaudioengine_fmodex.cpp 15 additions, 10 deletionsindra/llaudio/llaudioengine_fmodex.cpp
- indra/llaudio/llaudioengine_fmodex.h 3 additions, 1 deletionindra/llaudio/llaudioengine_fmodex.h
- indra/media_plugins/winmmshim/winmm_shim.cpp 50 additions, 31 deletionsindra/media_plugins/winmmshim/winmm_shim.cpp
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/llfloatersocial.cpp 0 additions, 22 deletionsindra/newview/llfloatersocial.cpp
- indra/newview/llfloatersocial.h 0 additions, 1 deletionindra/newview/llfloatersocial.h
- indra/newview/skins/default/xui/en/panel_social_photo.xml 0 additions, 8 deletionsindra/newview/skins/default/xui/en/panel_social_photo.xml
- indra/newview/viewer_manifest.py 15 additions, 2 deletionsindra/newview/viewer_manifest.py
Loading
Please register or sign in to comment