Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
No related branches found
No related tags found
Showing
- indra/llui/llmenugl.cpp 1 addition, 1 deletionindra/llui/llmenugl.cpp
- indra/llui/lltextbase.cpp 7 additions, 6 deletionsindra/llui/lltextbase.cpp
- indra/llui/llui.cpp 1 addition, 1 deletionindra/llui/llui.cpp
- indra/llui/llview.cpp 4 additions, 1 deletionindra/llui/llview.cpp
- indra/llui/llview.h 1 addition, 1 deletionindra/llui/llview.h
- indra/newview/llfolderview.cpp 2 additions, 2 deletionsindra/newview/llfolderview.cpp
- indra/newview/llfolderviewitem.cpp 1 addition, 1 deletionindra/newview/llfolderviewitem.cpp
- indra/newview/llinventorybridge.cpp 1 addition, 0 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/llinventoryfilter.cpp 1 addition, 1 deletionindra/newview/llinventoryfilter.cpp
- indra/newview/llinventorymodelbackgroundfetch.cpp 99 additions, 71 deletionsindra/newview/llinventorymodelbackgroundfetch.cpp
- indra/newview/llinventorymodelbackgroundfetch.h 2 additions, 2 deletionsindra/newview/llinventorymodelbackgroundfetch.h
- indra/newview/llinventorypanel.cpp 1 addition, 1 deletionindra/newview/llinventorypanel.cpp
- indra/newview/llpanelmaininventory.cpp 1 addition, 1 deletionindra/newview/llpanelmaininventory.cpp
- indra/newview/llscreenchannel.cpp 10 additions, 2 deletionsindra/newview/llscreenchannel.cpp
- indra/newview/lltoast.cpp 8 additions, 5 deletionsindra/newview/lltoast.cpp
- indra/newview/llviewerinventory.cpp 0 additions, 5 deletionsindra/newview/llviewerinventory.cpp
- indra/newview/skins/default/xui/en/floater_about_land.xml 2 additions, 2 deletionsindra/newview/skins/default/xui/en/floater_about_land.xml
- indra/newview/skins/default/xui/en/floater_choose_group.xml 1 addition, 1 deletionindra/newview/skins/default/xui/en/floater_choose_group.xml
- indra/newview/skins/default/xui/en/panel_group_roles.xml 1 addition, 1 deletionindra/newview/skins/default/xui/en/panel_group_roles.xml
Loading
Please register or sign in to comment