-
- Downloads
svn merge -r129617:130277...
svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-34223 : AVP Current Outfit Folder For DEV-37485 : AVP Appearance Side Panel For DEV-35335 : AVP Automatic Folder Classification This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
Showing
- indra/llcommon/llassettype.cpp 6 additions, 0 deletionsindra/llcommon/llassettype.cpp
- indra/llcommon/llassettype.h 1 addition, 0 deletionsindra/llcommon/llassettype.h
- indra/llinventory/llinventory.cpp 5 additions, 0 deletionsindra/llinventory/llinventory.cpp
- indra/llinventory/llinventory.h 1 addition, 1 deletionindra/llinventory/llinventory.h
- indra/newview/CMakeLists.txt 8 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/foldertypes.xml 16 additions, 0 deletionsindra/newview/app_settings/foldertypes.xml
- indra/newview/llagentwearables.cpp 226 additions, 34 deletionsindra/newview/llagentwearables.cpp
- indra/newview/llagentwearables.h 46 additions, 4 deletionsindra/newview/llagentwearables.h
- indra/newview/llfloaterinventory.cpp 2 additions, 2 deletionsindra/newview/llfloaterinventory.cpp
- indra/newview/llfloaterinventory.h 1 addition, 1 deletionindra/newview/llfloaterinventory.h
- indra/newview/llfloaterproperties.cpp 1 addition, 1 deletionindra/newview/llfloaterproperties.cpp
- indra/newview/llfolderview.cpp 1 addition, 20 deletionsindra/newview/llfolderview.cpp
- indra/newview/llfoldervieweventlistener.h 1 addition, 0 deletionsindra/newview/llfoldervieweventlistener.h
- indra/newview/llfolderviewitem.cpp 6 additions, 2 deletionsindra/newview/llfolderviewitem.cpp
- indra/newview/llinventorybridge.cpp 131 additions, 29 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/llinventorybridge.h 4 additions, 0 deletionsindra/newview/llinventorybridge.h
- indra/newview/llinventoryfilter.cpp 26 additions, 6 deletionsindra/newview/llinventoryfilter.cpp
- indra/newview/llinventoryfilter.h 3 additions, 2 deletionsindra/newview/llinventoryfilter.h
- indra/newview/llinventorymodel.cpp 38 additions, 10 deletionsindra/newview/llinventorymodel.cpp
- indra/newview/llinventorymodel.h 5 additions, 3 deletionsindra/newview/llinventorymodel.h
Loading
Please register or sign in to comment