-
- Downloads
For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]
svn merge -r136068:136089 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 Infrastructure changes for cleaning up Asset/Folder types. Associated sim changes are only so that the sim still compiles.
Showing
- indra/llcommon/CMakeLists.txt 2 additions, 0 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/llassettype.cpp 38 additions, 116 deletionsindra/llcommon/llassettype.cpp
- indra/llcommon/llassettype.h 9 additions, 53 deletionsindra/llcommon/llassettype.h
- indra/llcommon/llfoldertype.cpp 165 additions, 0 deletionsindra/llcommon/llfoldertype.cpp
- indra/llcommon/llfoldertype.h 123 additions, 0 deletionsindra/llcommon/llfoldertype.h
- indra/llinventory/llinventory.cpp 15 additions, 47 deletionsindra/llinventory/llinventory.cpp
- indra/llinventory/llinventory.h 6 additions, 7 deletionsindra/llinventory/llinventory.h
- indra/llinventory/llinventorytype.cpp 0 additions, 34 deletionsindra/llinventory/llinventorytype.cpp
- indra/llinventory/llinventorytype.h 1 addition, 2 deletionsindra/llinventory/llinventorytype.h
- indra/llinventory/tests/inventorymisc_test.cpp 2 additions, 2 deletionsindra/llinventory/tests/inventorymisc_test.cpp
- indra/llmessage/lltransfersourceasset.cpp 0 additions, 2 deletionsindra/llmessage/lltransfersourceasset.cpp
- indra/newview/CMakeLists.txt 4 additions, 2 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/foldertypes.xml 10 additions, 15 deletionsindra/newview/app_settings/foldertypes.xml
- indra/newview/llagentwearables.cpp 8 additions, 9 deletionsindra/newview/llagentwearables.cpp
- indra/newview/llappearancemgr.cpp 11 additions, 11 deletionsindra/newview/llappearancemgr.cpp
- indra/newview/llassetuploadresponders.cpp 1 addition, 1 deletionindra/newview/llassetuploadresponders.cpp
- indra/newview/llavataractions.cpp 2 additions, 2 deletionsindra/newview/llavataractions.cpp
- indra/newview/llfavoritesbar.cpp 2 additions, 2 deletionsindra/newview/llfavoritesbar.cpp
- indra/newview/llfloateranimpreview.cpp 1 addition, 1 deletionindra/newview/llfloateranimpreview.cpp
- indra/newview/llfloaterbulkpermission.cpp 0 additions, 1 deletionindra/newview/llfloaterbulkpermission.cpp
Loading
Please register or sign in to comment