merge...
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3 * Bugs: EXT-888 EXT-866 EXT-861 EXT-858 EXT-864 EXT-875 EXT-884 EXT-718 EXT-786 EXT-885 EXT-910 EXT-845 EXT-312 EXT-823 EXT-868 * New Development: EXT-748 EXT-863 EXT-835 QA: Please test Recent List to verify it has no troubles.
Showing
- indra/llcommon/llstring.cpp 7 additions, 2 deletionsindra/llcommon/llstring.cpp
- indra/llui/CMakeLists.txt 2 additions, 0 deletionsindra/llui/CMakeLists.txt
- indra/llui/lldockcontrol.cpp 13 additions, 0 deletionsindra/llui/lldockcontrol.cpp
- indra/llui/lldockcontrol.h 1 addition, 2 deletionsindra/llui/lldockcontrol.h
- indra/llui/llfiltereditor.cpp 4 additions, 70 deletionsindra/llui/llfiltereditor.cpp
- indra/llui/llfiltereditor.h 4 additions, 26 deletionsindra/llui/llfiltereditor.h
- indra/llui/llflatlistview.cpp 494 additions, 0 deletionsindra/llui/llflatlistview.cpp
- indra/llui/llflatlistview.h 262 additions, 0 deletionsindra/llui/llflatlistview.h
- indra/llui/llsearcheditor.cpp 70 additions, 12 deletionsindra/llui/llsearcheditor.cpp
- indra/llui/llsearcheditor.h 16 additions, 8 deletionsindra/llui/llsearcheditor.h
- indra/llui/lltabcontainer.cpp 4 additions, 5 deletionsindra/llui/lltabcontainer.cpp
- indra/llui/llview.h 1 addition, 1 deletionindra/llui/llview.h
- indra/newview/llavatarlist.cpp 213 additions, 0 deletionsindra/newview/llavatarlist.cpp
- indra/newview/llavatarlist.h 42 additions, 0 deletionsindra/newview/llavatarlist.h
- indra/newview/llavatarlistitem.cpp 56 additions, 165 deletionsindra/newview/llavatarlistitem.cpp
- indra/newview/llavatarlistitem.h 32 additions, 62 deletionsindra/newview/llavatarlistitem.h
- indra/newview/llchiclet.cpp 9 additions, 17 deletionsindra/newview/llchiclet.cpp
- indra/newview/llchiclet.h 0 additions, 1 deletionindra/newview/llchiclet.h
- indra/newview/llfloatercamera.cpp 4 additions, 14 deletionsindra/newview/llfloatercamera.cpp
- indra/newview/llfloatercamera.h 2 additions, 3 deletionsindra/newview/llfloatercamera.h
Loading
Please register or sign in to comment