merge changes for storm-373
Showing
- .hgtags 8 additions, 0 deletions.hgtags
- BuildParams 1 addition, 0 deletionsBuildParams
- build.sh 2 additions, 1 deletionbuild.sh
- doc/contributions.txt 11 additions, 0 deletionsdoc/contributions.txt
- indra/cmake/Copy3rdPartyLibs.cmake 2 additions, 0 deletionsindra/cmake/Copy3rdPartyLibs.cmake
- indra/llcommon/llavatarname.cpp 1 addition, 1 deletionindra/llcommon/llavatarname.cpp
- indra/llcommon/llavatarname.h 1 addition, 1 deletionindra/llcommon/llavatarname.h
- indra/llimage/llimage.cpp 9 additions, 9 deletionsindra/llimage/llimage.cpp
- indra/llimage/llimage.h 2 additions, 2 deletionsindra/llimage/llimage.h
- indra/llmath/llvolume.cpp 38 additions, 3 deletionsindra/llmath/llvolume.cpp
- indra/llmath/llvolume.h 1 addition, 0 deletionsindra/llmath/llvolume.h
- indra/llmessage/llavatarnamecache.cpp 155 additions, 110 deletionsindra/llmessage/llavatarnamecache.cpp
- indra/llmessage/llavatarnamecache.h 3 additions, 0 deletionsindra/llmessage/llavatarnamecache.h
- indra/llmessage/llcircuit.cpp 3 additions, 0 deletionsindra/llmessage/llcircuit.cpp
- indra/llmessage/llcircuit.h 3 additions, 1 deletionindra/llmessage/llcircuit.h
- indra/llprimitive/lltextureentry.cpp 1 addition, 1 deletionindra/llprimitive/lltextureentry.cpp
- indra/llrender/llimagegl.cpp 0 additions, 10 deletionsindra/llrender/llimagegl.cpp
- indra/llui/llnotifications.cpp 2 additions, 4 deletionsindra/llui/llnotifications.cpp
- indra/llvfs/lldir.cpp 10 additions, 3 deletionsindra/llvfs/lldir.cpp
- indra/newview/CMakeLists.txt 22 additions, 12 deletionsindra/newview/CMakeLists.txt
Loading
Please register or sign in to comment