QAR-1284 ip-takedown tools simulator work is ready for merge
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5 no conflicts
Showing
- indra/llcommon/lllivefile.cpp 9 additions, 0 deletionsindra/llcommon/lllivefile.cpp
- indra/llcommon/lllivefile.h 2 additions, 0 deletionsindra/llcommon/lllivefile.h
- indra/llinventory/llinventory.cpp 10 additions, 13 deletionsindra/llinventory/llinventory.cpp
- indra/llinventory/llinventory.h 6 additions, 81 deletionsindra/llinventory/llinventory.h
- indra/llinventory/llsaleinfo.cpp 1 addition, 1 deletionindra/llinventory/llsaleinfo.cpp
- indra/llinventory/llsaleinfo.h 1 addition, 1 deletionindra/llinventory/llsaleinfo.h
- indra/llprimitive/CMakeLists.txt 2 additions, 0 deletionsindra/llprimitive/CMakeLists.txt
- indra/llprimitive/llprimitive.cpp 84 additions, 327 deletionsindra/llprimitive/llprimitive.cpp
- indra/llprimitive/llprimitive.h 15 additions, 9 deletionsindra/llprimitive/llprimitive.h
- indra/llprimitive/llprimtexturelist.cpp 414 additions, 0 deletionsindra/llprimitive/llprimtexturelist.cpp
- indra/llprimitive/llprimtexturelist.h 126 additions, 0 deletionsindra/llprimitive/llprimtexturelist.h
- indra/llprimitive/lltextureentry.cpp 87 additions, 21 deletionsindra/llprimitive/lltextureentry.cpp
- indra/llprimitive/lltextureentry.h 12 additions, 2 deletionsindra/llprimitive/lltextureentry.h
Loading
Please register or sign in to comment