-
- Downloads
For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"
svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
Showing
- indra/llcommon/CMakeLists.txt 1 addition, 0 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/llassettype.cpp 185 additions, 155 deletionsindra/llcommon/llassettype.cpp
- indra/llcommon/llassettype.h 98 additions, 72 deletionsindra/llcommon/llassettype.h
- indra/llcommon/lldictionary.h 106 additions, 0 deletionsindra/llcommon/lldictionary.h
- indra/llcommon/stdenums.h 2 additions, 1 deletionindra/llcommon/stdenums.h
- indra/llinventory/llinventory.cpp 47 additions, 7 deletionsindra/llinventory/llinventory.cpp
- indra/llinventory/llinventory.h 15 additions, 11 deletionsindra/llinventory/llinventory.h
- indra/llinventory/llinventorytype.cpp 123 additions, 118 deletionsindra/llinventory/llinventorytype.cpp
- indra/llinventory/llinventorytype.h 7 additions, 3 deletionsindra/llinventory/llinventorytype.h
- indra/llinventory/llparcel.h 3 additions, 1 deletionindra/llinventory/llparcel.h
- indra/llinventory/llpermissions.cpp 11 additions, 0 deletionsindra/llinventory/llpermissions.cpp
- indra/llinventory/llpermissions.h 3 additions, 0 deletionsindra/llinventory/llpermissions.h
- indra/llmessage/lltransfersourceasset.cpp 26 additions, 22 deletionsindra/llmessage/lltransfersourceasset.cpp
- indra/llmessage/message_prehash.cpp 1 addition, 0 deletionsindra/llmessage/message_prehash.cpp
- indra/llmessage/message_prehash.h 1 addition, 0 deletionsindra/llmessage/message_prehash.h
- indra/newview/llinventorybridge.cpp 4 additions, 5 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/llviewerinventory.cpp 2 additions, 2 deletionsindra/newview/llviewerinventory.cpp
- scripts/messages/message_template.msg 18 additions, 0 deletionsscripts/messages/message_template.msg
Loading
Please register or sign in to comment