Manual merge from default branch.
Auto-resolved conflicts in: - indra/newview/llpaneleditwearable.cpp - indra/newview/llviewermenu.cpp - indra/newview/llviewerwindow.cpp - indra/newview/skins/default/xui/en/notifications.xml --HG-- branch : product-engine
No related branches found
No related tags found
Showing
- doc/contributions.txt 1 addition, 0 deletionsdoc/contributions.txt
- indra/newview/app_settings/CA.pem 1688 additions, 1628 deletionsindra/newview/app_settings/CA.pem
- indra/newview/character/avatar_lad.xml 264 additions, 0 deletionsindra/newview/character/avatar_lad.xml
- indra/newview/llagent.cpp 9 additions, 6 deletionsindra/newview/llagent.cpp
- indra/newview/llagentwearables.cpp 17 additions, 173 deletionsindra/newview/llagentwearables.cpp
- indra/newview/llagentwearables.h 4 additions, 18 deletionsindra/newview/llagentwearables.h
- indra/newview/llappearancemgr.cpp 10 additions, 3 deletionsindra/newview/llappearancemgr.cpp
- indra/newview/llface.cpp 12 additions, 3 deletionsindra/newview/llface.cpp
- indra/newview/llinventorybridge.cpp 14 additions, 12 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/llpaneleditwearable.cpp 2 additions, 1 deletionindra/newview/llpaneleditwearable.cpp
- indra/newview/llsechandler_basic.cpp 23 additions, 22 deletionsindra/newview/llsechandler_basic.cpp
- indra/newview/llviewermenu.cpp 26 additions, 30 deletionsindra/newview/llviewermenu.cpp
- indra/newview/llviewernetwork.cpp 25 additions, 1 deletionindra/newview/llviewernetwork.cpp
- indra/newview/llviewerwindow.cpp 303 additions, 273 deletionsindra/newview/llviewerwindow.cpp
- indra/newview/llvoavatar.cpp 10 additions, 2 deletionsindra/newview/llvoavatar.cpp
- indra/newview/llvoavatar.h 11 additions, 2 deletionsindra/newview/llvoavatar.h
- indra/newview/llvoavatarself.cpp 68 additions, 47 deletionsindra/newview/llvoavatarself.cpp
- indra/newview/llvoavatarself.h 32 additions, 24 deletionsindra/newview/llvoavatarself.h
- indra/newview/skins/default/xui/en/notifications.xml 17 additions, 8 deletionsindra/newview/skins/default/xui/en/notifications.xml
- indra/newview/skins/default/xui/en/panel_edit_tattoo.xml 14 additions, 0 deletionsindra/newview/skins/default/xui/en/panel_edit_tattoo.xml
Loading
Please register or sign in to comment