merge...
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1378 https://svn.aws.productengine.com/secondlife/pe/stable-1@1386 -> viewer-2.0.0-3 EXT-357 EXT-370 EXT-385 EXT-409 EXT-472 EXT-479 EXT-513 EXT-532 EXT-541 EXT-544 EXT-546
Showing
- indra/newview/CMakeLists.txt 2 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/llchiclet.cpp 85 additions, 15 deletionsindra/newview/llchiclet.cpp
- indra/newview/llchiclet.h 14 additions, 1 deletionindra/newview/llchiclet.h
- indra/newview/llfavoritesbar.cpp 1 addition, 1 deletionindra/newview/llfavoritesbar.cpp
- indra/newview/llimpanel.cpp 6 additions, 0 deletionsindra/newview/llimpanel.cpp
- indra/newview/llimpanel.h 3 additions, 0 deletionsindra/newview/llimpanel.h
- indra/newview/llpanelgroup.cpp 5 additions, 0 deletionsindra/newview/llpanelgroup.cpp
- indra/newview/llpanelgroupgeneral.cpp 0 additions, 47 deletionsindra/newview/llpanelgroupgeneral.cpp
- indra/newview/llpanelgroupgeneral.h 0 additions, 3 deletionsindra/newview/llpanelgroupgeneral.h
- indra/newview/llpanelpeople.cpp 99 additions, 0 deletionsindra/newview/llpanelpeople.cpp
- indra/newview/llpanelpeople.h 10 additions, 0 deletionsindra/newview/llpanelpeople.h
- indra/newview/llpanelplaceinfo.cpp 23 additions, 0 deletionsindra/newview/llpanelplaceinfo.cpp
- indra/newview/llpanelplaceinfo.h 5 additions, 1 deletionindra/newview/llpanelplaceinfo.h
- indra/newview/llpanelplaces.cpp 24 additions, 12 deletionsindra/newview/llpanelplaces.cpp
- indra/newview/llpanelplaces.h 0 additions, 3 deletionsindra/newview/llpanelplaces.h
- indra/newview/llteleporthistorystorage.cpp 164 additions, 0 deletionsindra/newview/llteleporthistorystorage.cpp
- indra/newview/llteleporthistorystorage.h 108 additions, 0 deletionsindra/newview/llteleporthistorystorage.h
- indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml 0 additions, 8 deletionsindra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
- indra/newview/skins/default/xui/en/menu_landmark.xml 0 additions, 1 deletionindra/newview/skins/default/xui/en/menu_landmark.xml
- indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml 18 additions, 0 deletions...ew/skins/default/xui/en/menu_people_friends_view_sort.xml
Loading
Please register or sign in to comment