merge...
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 * Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816 * Major Bugs: EXT-1142 (timeout during login due to processing group IMs) * Changes: EXT-1216 (minimize message well)
Showing
- indra/llui/CMakeLists.txt 2 additions, 0 deletionsindra/llui/CMakeLists.txt
- indra/llui/lldockablefloater.cpp 9 additions, 9 deletionsindra/llui/lldockablefloater.cpp
- indra/llui/lldockcontrol.cpp 39 additions, 39 deletionsindra/llui/lldockcontrol.cpp
- indra/llui/lldockcontrol.h 5 additions, 5 deletionsindra/llui/lldockcontrol.h
- indra/llui/llflatlistview.cpp 2 additions, 2 deletionsindra/llui/llflatlistview.cpp
- indra/llui/lltexteditor.cpp 43 additions, 0 deletionsindra/llui/lltexteditor.cpp
- indra/llui/lltexteditor.h 9 additions, 1 deletionindra/llui/lltexteditor.h
- indra/newview/llavatarlist.cpp 91 additions, 45 deletionsindra/newview/llavatarlist.cpp
- indra/newview/llavatarlist.h 23 additions, 2 deletionsindra/newview/llavatarlist.h
- indra/newview/llbottomtray.cpp 3 additions, 2 deletionsindra/newview/llbottomtray.cpp
- indra/newview/llchannelmanager.cpp 35 additions, 19 deletionsindra/newview/llchannelmanager.cpp
- indra/newview/llchannelmanager.h 10 additions, 6 deletionsindra/newview/llchannelmanager.h
- indra/newview/llchatitemscontainerctrl.cpp 65 additions, 327 deletionsindra/newview/llchatitemscontainerctrl.cpp
- indra/newview/llchatitemscontainerctrl.h 17 additions, 69 deletionsindra/newview/llchatitemscontainerctrl.h
- indra/newview/llchatmsgbox.cpp 1 addition, 1 deletionindra/newview/llchatmsgbox.cpp
- indra/newview/llchiclet.cpp 27 additions, 4 deletionsindra/newview/llchiclet.cpp
- indra/newview/llchiclet.h 2 additions, 1 deletionindra/newview/llchiclet.h
- indra/newview/llfavoritesbar.cpp 11 additions, 0 deletionsindra/newview/llfavoritesbar.cpp
- indra/newview/llfavoritesbar.h 1 addition, 1 deletionindra/newview/llfavoritesbar.h
- indra/newview/llfloaterchatterbox.cpp 2 additions, 1 deletionindra/newview/llfloaterchatterbox.cpp
Loading
Please register or sign in to comment