-
- Downloads
Merge of latest avatar pipeline working branch into viewer2.0 branch.
Result of: (NO CONFLICTS) svn merge -r 135985:136503 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-11 .
Showing
- indra/llcommon/llassettype.cpp 5 additions, 5 deletionsindra/llcommon/llassettype.cpp
- indra/newview/llappearancemgr.cpp 68 additions, 20 deletionsindra/newview/llappearancemgr.cpp
- indra/newview/llappearancemgr.h 5 additions, 0 deletionsindra/newview/llappearancemgr.h
- indra/newview/llfloaterinventory.cpp 95 additions, 70 deletionsindra/newview/llfloaterinventory.cpp
- indra/newview/llfloaterinventory.h 10 additions, 4 deletionsindra/newview/llfloaterinventory.h
- indra/newview/llfolderview.h 0 additions, 2 deletionsindra/newview/llfolderview.h
- indra/newview/llinventorybridge.cpp 13 additions, 1 deletionindra/newview/llinventorybridge.cpp
- indra/newview/llviewerinventory.cpp 18 additions, 2 deletionsindra/newview/llviewerinventory.cpp
- indra/newview/llviewerinventory.h 2 additions, 0 deletionsindra/newview/llviewerinventory.h
- indra/newview/skins/default/xui/en/menu_inventory.xml 0 additions, 8 deletionsindra/newview/skins/default/xui/en/menu_inventory.xml
- indra/newview/skins/default/xui/en/panel_landmarks.xml 1 addition, 0 deletionsindra/newview/skins/default/xui/en/panel_landmarks.xml
Loading
Please register or sign in to comment