Automated merge with tip of viewer-release
No related branches found
No related tags found
Showing
- .hgtags 1 addition, 0 deletions.hgtags
- autobuild.xml 5 additions, 5 deletionsautobuild.xml
- doc/contributions.txt 1 addition, 0 deletionsdoc/contributions.txt
- indra/llcommon/llsdserialize.cpp 38 additions, 27 deletionsindra/llcommon/llsdserialize.cpp
- indra/llcommon/llsdserialize.h 17 additions, 1 deletionindra/llcommon/llsdserialize.h
- indra/llcommon/llthread.cpp 20 additions, 38 deletionsindra/llcommon/llthread.cpp
- indra/llimage/llimage.cpp 6 additions, 1 deletionindra/llimage/llimage.cpp
- indra/llimage/llimagedimensionsinfo.cpp 1 addition, 1 deletionindra/llimage/llimagedimensionsinfo.cpp
- indra/llimage/llimagej2c.cpp 17 additions, 8 deletionsindra/llimage/llimagej2c.cpp
- indra/llmath/llvolume.cpp 52 additions, 14 deletionsindra/llmath/llvolume.cpp
- indra/llmath/llvolume.h 2 additions, 2 deletionsindra/llmath/llvolume.h
- indra/llmessage/llavatarnamecache.cpp 1 addition, 1 deletionindra/llmessage/llavatarnamecache.cpp
- indra/llprimitive/llmodel.cpp 7 additions, 4 deletionsindra/llprimitive/llmodel.cpp
- indra/llrender/llimagegl.cpp 29 additions, 11 deletionsindra/llrender/llimagegl.cpp
- indra/llrender/llimagegl.h 1 addition, 1 deletionindra/llrender/llimagegl.h
- indra/llrender/llvertexbuffer.cpp 34 additions, 4 deletionsindra/llrender/llvertexbuffer.cpp
- indra/llui/llbadge.cpp 1 addition, 1 deletionindra/llui/llbadge.cpp
- indra/llui/llurlentry.cpp 6 additions, 5 deletionsindra/llui/llurlentry.cpp
- indra/llui/llurlregistry.cpp 3 additions, 32 deletionsindra/llui/llurlregistry.cpp
- indra/llwindow/llwindowwin32.cpp 38 additions, 5 deletionsindra/llwindow/llwindowwin32.cpp
Loading
Please register or sign in to comment