merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3
EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511
Showing
- indra/newview/llfavoritesbar.cpp 2 additions, 12 deletionsindra/newview/llfavoritesbar.cpp
- indra/newview/lllandmarkactions.cpp 9 additions, 9 deletionsindra/newview/lllandmarkactions.cpp
- indra/newview/lllandmarkactions.h 3 additions, 3 deletionsindra/newview/lllandmarkactions.h
- indra/newview/llpanelavatar.cpp 0 additions, 6 deletionsindra/newview/llpanelavatar.cpp
- indra/newview/llpanelgroupgeneral.cpp 6 additions, 15 deletionsindra/newview/llpanelgroupgeneral.cpp
- indra/newview/llpanelpicks.cpp 1 addition, 0 deletionsindra/newview/llpanelpicks.cpp
- indra/newview/llpanelplaceinfo.cpp 4 additions, 4 deletionsindra/newview/llpanelplaceinfo.cpp
- indra/newview/llpanelplaces.cpp 116 additions, 41 deletionsindra/newview/llpanelplaces.cpp
- indra/newview/llpanelplaces.h 7 additions, 1 deletionindra/newview/llpanelplaces.h
- indra/newview/llpanelprofile.cpp 10 additions, 0 deletionsindra/newview/llpanelprofile.cpp
- indra/newview/llpanelprofile.h 8 additions, 0 deletionsindra/newview/llpanelprofile.h
- indra/newview/llpanelprofileview.cpp 0 additions, 24 deletionsindra/newview/llpanelprofileview.cpp
- indra/newview/llpanelprofileview.h 0 additions, 12 deletionsindra/newview/llpanelprofileview.h
- indra/newview/skins/default/xui/en/favorites_bar_button.xml 0 additions, 2 deletionsindra/newview/skins/default/xui/en/favorites_bar_button.xml
- indra/newview/skins/default/xui/en/menu_landmark.xml 33 additions, 0 deletionsindra/newview/skins/default/xui/en/menu_landmark.xml
- indra/newview/skins/default/xui/en/menu_place.xml 47 additions, 0 deletionsindra/newview/skins/default/xui/en/menu_place.xml
- indra/newview/skins/default/xui/en/panel_group_general.xml 15 additions, 1 deletionindra/newview/skins/default/xui/en/panel_group_general.xml
- indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml 1 addition, 1 deletion...ewview/skins/default/xui/en/panel_group_info_sidetray.xml
- indra/newview/skins/default/xui/en/panel_pick_list_item.xml 1 addition, 1 deletionindra/newview/skins/default/xui/en/panel_pick_list_item.xml
- indra/newview/skins/default/xui/en/panel_places.xml 20 additions, 13 deletionsindra/newview/skins/default/xui/en/panel_places.xml
Loading
Please register or sign in to comment