svn merge -r130469:130817...
svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 This merges in all appearance side panel bug fixes.
Showing
- indra/llcommon/llassettype.cpp 2 additions, 2 deletionsindra/llcommon/llassettype.cpp
- indra/newview/llagentwearables.cpp 160 additions, 98 deletionsindra/newview/llagentwearables.cpp
- indra/newview/llagentwearables.h 8 additions, 32 deletionsindra/newview/llagentwearables.h
- indra/newview/llfloaterinventory.cpp 3 additions, 2 deletionsindra/newview/llfloaterinventory.cpp
- indra/newview/llfolderviewitem.cpp 8 additions, 0 deletionsindra/newview/llfolderviewitem.cpp
- indra/newview/llinventorybridge.cpp 90 additions, 19 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/llinventorybridge.h 3 additions, 0 deletionsindra/newview/llinventorybridge.h
- indra/newview/llinventoryfilter.cpp 9 additions, 1 deletionindra/newview/llinventoryfilter.cpp
- indra/newview/llinventorymodel.cpp 31 additions, 26 deletionsindra/newview/llinventorymodel.cpp
- indra/newview/llviewerinventory.cpp 1 addition, 4 deletionsindra/newview/llviewerinventory.cpp
- indra/newview/llvoavatarself.cpp 13 additions, 0 deletionsindra/newview/llvoavatarself.cpp
- indra/newview/llvoavatarself.h 1 addition, 0 deletionsindra/newview/llvoavatarself.h
- indra/newview/skins/default/textures/textures.xml 2 additions, 0 deletionsindra/newview/skins/default/textures/textures.xml
- indra/newview/skins/default/xui/en/floater_customize.xml 0 additions, 10 deletionsindra/newview/skins/default/xui/en/floater_customize.xml
- indra/newview/skins/default/xui/en/floater_inventory.xml 0 additions, 16 deletionsindra/newview/skins/default/xui/en/floater_inventory.xml
- indra/newview/skins/default/xui/en/menu_inventory.xml 0 additions, 32 deletionsindra/newview/skins/default/xui/en/menu_inventory.xml
- indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml 4 additions, 4 deletions.../newview/skins/default/xui/en/panel_sidetray_home_tab.xml
- indra/newview/skins/default/xui/en/strings.xml 1 addition, 0 deletionsindra/newview/skins/default/xui/en/strings.xml
Loading
Please register or sign in to comment