merge...
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3 * Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790 * New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788 * EXT-272 - Draggable Landmarks * EXT-715 - Block List Panel * EXT-782 - Implement advanced place information accordions
Showing
- indra/llinventory/llinventory.h 1 addition, 1 deletionindra/llinventory/llinventory.h
- indra/llrender/llfontregistry.cpp 1 addition, 1 deletionindra/llrender/llfontregistry.cpp
- indra/llui/CMakeLists.txt 4 additions, 0 deletionsindra/llui/CMakeLists.txt
- indra/llui/llbutton.cpp 19 additions, 0 deletionsindra/llui/llbutton.cpp
- indra/llui/lldockablefloater.cpp 86 additions, 0 deletionsindra/llui/lldockablefloater.cpp
- indra/llui/lldockablefloater.h 65 additions, 0 deletionsindra/llui/lldockablefloater.h
- indra/llui/lldockcontrol.cpp 126 additions, 0 deletionsindra/llui/lldockcontrol.cpp
- indra/llui/lldockcontrol.h 81 additions, 0 deletionsindra/llui/lldockcontrol.h
- indra/llui/llscrolllistctrl.cpp 24 additions, 11 deletionsindra/llui/llscrolllistctrl.cpp
- indra/llui/llscrolllistctrl.h 9 additions, 1 deletionindra/llui/llscrolllistctrl.h
- indra/llui/lltextbox.cpp 4 additions, 1 deletionindra/llui/lltextbox.cpp
- indra/llui/lltexteditor.cpp 2 additions, 5 deletionsindra/llui/lltexteditor.cpp
- indra/llui/llview.cpp 2 additions, 2 deletionsindra/llui/llview.cpp
- indra/llui/llview.h 1 addition, 1 deletionindra/llui/llview.h
- indra/newview/CMakeLists.txt 6 additions, 2 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/settings.xml 14 additions, 3 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llagent.cpp 0 additions, 1 deletionindra/newview/llagent.cpp
- indra/newview/llavatarlist.cpp 2 additions, 1 deletionindra/newview/llavatarlist.cpp
- indra/newview/llbottomtray.cpp 52 additions, 2 deletionsindra/newview/llbottomtray.cpp
- indra/newview/llbottomtray.h 12 additions, 1 deletionindra/newview/llbottomtray.h
Loading
Please register or sign in to comment