Automated merge for avatar-pipeline pull
--HG-- branch : avatar-pipeline
No related branches found
No related tags found
Showing
- indra/llcommon/llsys.cpp 66 additions, 66 deletionsindra/llcommon/llsys.cpp
- indra/newview/llagentwearables.cpp 15 additions, 6 deletionsindra/newview/llagentwearables.cpp
- indra/newview/llimfloatercontainer.cpp 96 additions, 96 deletionsindra/newview/llimfloatercontainer.cpp
- indra/newview/llimfloatercontainer.h 61 additions, 61 deletionsindra/newview/llimfloatercontainer.h
- indra/newview/llinventorybridge.cpp 5205 additions, 5205 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/lltexlayer.cpp 31 additions, 16 deletionsindra/newview/lltexlayer.cpp
- indra/newview/llvoavatar.cpp 37 additions, 8 deletionsindra/newview/llvoavatar.cpp
- indra/newview/llvoavatar.h 2 additions, 0 deletionsindra/newview/llvoavatar.h
- indra/newview/llvoavatarself.cpp 3 additions, 3 deletionsindra/newview/llvoavatarself.cpp
- indra/newview/llvoavatarself.h 1 addition, 1 deletionindra/newview/llvoavatarself.h
- indra/newview/llwearable.cpp 1 addition, 1 deletionindra/newview/llwearable.cpp
Loading
Please register or sign in to comment