merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0 Fixes: EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412 Other changes: Movement & Caemra controls work Profile and Me panel refactoring Notification refactoring
Showing
- indra/llui/CMakeLists.txt 2 additions, 0 deletionsindra/llui/CMakeLists.txt
- indra/llui/llbutton.cpp 10 additions, 8 deletionsindra/llui/llbutton.cpp
- indra/llui/llbutton.h 4 additions, 2 deletionsindra/llui/llbutton.h
- indra/llui/llclipboard.cpp 6 additions, 0 deletionsindra/llui/llclipboard.cpp
- indra/llui/llclipboard.h 1 addition, 0 deletionsindra/llui/llclipboard.h
- indra/llui/llfiltereditor.cpp 6 additions, 0 deletionsindra/llui/llfiltereditor.cpp
- indra/llui/llfiltereditor.h 1 addition, 0 deletionsindra/llui/llfiltereditor.h
- indra/llui/llfocusmgr.cpp 3 additions, 1 deletionindra/llui/llfocusmgr.cpp
- indra/llui/lllineeditor.cpp 5 additions, 1 deletionindra/llui/lllineeditor.cpp
- indra/llui/llmenugl.cpp 10 additions, 1 deletionindra/llui/llmenugl.cpp
- indra/llui/llmenugl.h 3 additions, 8 deletionsindra/llui/llmenugl.h
- indra/llui/llscrolllistctrl.cpp 2 additions, 1 deletionindra/llui/llscrolllistctrl.cpp
- indra/llui/lltextbox.cpp 6 additions, 0 deletionsindra/llui/lltextbox.cpp
- indra/llui/lluictrl.cpp 18 additions, 5 deletionsindra/llui/lluictrl.cpp
- indra/llui/lluictrl.h 14 additions, 4 deletionsindra/llui/lluictrl.h
- indra/llui/llview.cpp 2 additions, 0 deletionsindra/llui/llview.cpp
- indra/newview/CMakeLists.txt 6 additions, 4 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/settings.xml 100 additions, 7 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llagent.cpp 66 additions, 16 deletionsindra/newview/llagent.cpp
- indra/newview/llagent.h 36 additions, 1 deletionindra/newview/llagent.h
Loading
Please register or sign in to comment