merge changes for 5.1.7-release
Showing
- .hgtags 1 addition, 0 deletions.hgtags
- autobuild.xml 7 additions, 5 deletionsautobuild.xml
- doc/contributions.txt 0 additions, 1 deletiondoc/contributions.txt
- indra/llcommon/indra_constants.h 1 addition, 0 deletionsindra/llcommon/indra_constants.h
- indra/llcommon/llcoros.cpp 29 additions, 2 deletionsindra/llcommon/llcoros.cpp
- indra/llcommon/llcoros.h 4 additions, 0 deletionsindra/llcommon/llcoros.h
- indra/llcommon/llerror.cpp 7 additions, 17 deletionsindra/llcommon/llerror.cpp
- indra/llcorehttp/_httpservice.cpp 5 additions, 3 deletionsindra/llcorehttp/_httpservice.cpp
- indra/llrender/llvertexbuffer.cpp 7 additions, 1 deletionindra/llrender/llvertexbuffer.cpp
- indra/llui/llscrolllistctrl.cpp 0 additions, 1 deletionindra/llui/llscrolllistctrl.cpp
- indra/newview/CMakeLists.txt 8 additions, 1 deletionindra/newview/CMakeLists.txt
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/app_settings/settings.xml 4 additions, 4 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llagentcamera.cpp 19 additions, 25 deletionsindra/newview/llagentcamera.cpp
- indra/newview/llagentcamera.h 2 additions, 0 deletionsindra/newview/llagentcamera.h
- indra/newview/llappviewer.cpp 14 additions, 6 deletionsindra/newview/llappviewer.cpp
- indra/newview/llchathistory.cpp 22 additions, 3 deletionsindra/newview/llchathistory.cpp
- indra/newview/lldirpicker.cpp 129 additions, 30 deletionsindra/newview/lldirpicker.cpp
- indra/newview/lldirpicker.h 41 additions, 1 deletionindra/newview/lldirpicker.h
- indra/newview/lldrawpoolalpha.cpp 3 additions, 0 deletionsindra/newview/lldrawpoolalpha.cpp
Loading
Please register or sign in to comment